Merge: redhat: set defaults for RHEL 10.1

MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-10/-/merge_requests/310

JIRA: INTERNAL
Upstream Status: RHEL only

Now that we have forked from CentOS Stream, we need to switch the release number
to use the zstream scheme and update our default disttag to match that used by
the brew build environment for RHEL 10.1.

Signed-off-by: Julio Faracco <jfaracco@redhat.com>

Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Tales da Aparecida <tales.aparecida@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Julio Faracco <jfaracco@redhat.com>

Author: jcfaracco

.gitlab-ci.yml

@@ -10,6 +10,7 @@ workflow: !reference [.workflow]
   variables:
     srpm_make_target: dist-srpm
     native_tools: 'true'
+    disttag_override: '.el10_1'
 
 .trigger_trusted_pipeline:
   extends: [.trusted, .10_common]
@@ -25,7 +26,7 @@ workflow: !reference [.workflow]
   trigger:
     branch: rhel10
   variables:
-    kcidb_tree_name: rhel-10
+    kcidb_tree_name: rhel-10.1
     builder_image: quay.io/cki/builder-rhel10
 
 .trigger_internal_compat_build_pipeline:

Makefile.rhelver

@@ -47,7 +47,7 @@ RHEL_REBASE_NUM = 1
 #  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
 #  number will be incremented instead of the Y).
 #
-ZSTREAM ?= no
+ZSTREAM ?= yes
 
 #
 # Early y+1 numbering

redhat/Makefile.variables

@@ -40,7 +40,7 @@ BUMP_RELEASE:=yes
 
 # This is the dist release suffix used in the package release, eg. .fc34,
 # .el8 etc. In a different branch this may be set to a fixed value.
-DIST ?= .el10
+DIST ?= .el10_1
 
 # This is a human readable distribution variable that is used to determine the
 # OS version (fedora, centos, or rhel).

redhat/self-test/data/centos-2585cf9dfaad.el7

@@ -8,6 +8,7 @@ AUTOMOTIVE_MAJOR=2
 AUTOMOTIVE_MINOR=0
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -102,6 +103,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.10
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM_FLAG=yes
 _OUTPUT=..

redhat/self-test/data/centos-2585cf9dfaad.el7.spec

@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]

redhat/self-test/data/centos-2585cf9dfaad.fc25

@@ -8,6 +8,7 @@ AUTOMOTIVE_MAJOR=2
 AUTOMOTIVE_MINOR=0
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -102,6 +103,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.10
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM_FLAG=yes
 _OUTPUT=..

redhat/self-test/data/centos-2585cf9dfaad.fc25.spec

@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]

redhat/self-test/data/centos-78e36f3b0dae.el7

@@ -8,6 +8,7 @@ AUTOMOTIVE_MAJOR=2
 AUTOMOTIVE_MINOR=0
 BASEVERSION=5.16.0-6.test
 BUILD=6
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -102,6 +103,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.10
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM_FLAG=yes
 _OUTPUT=..

redhat/self-test/data/centos-78e36f3b0dae.el7.spec

@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]

redhat/self-test/data/centos-78e36f3b0dae.fc25

@@ -8,6 +8,7 @@ AUTOMOTIVE_MAJOR=2
 AUTOMOTIVE_MINOR=0
 BASEVERSION=5.16.0-6.test
 BUILD=6
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -102,6 +103,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.10
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM_FLAG=yes
 _OUTPUT=..