Merge: redhat: set defaults for RHEL 9.5

MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/2329

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 9.5.

Signed-off-by: Lucas Zampieri <lzampier@redhat.com>

Approved-by: Herton R. Krzesinski <herton@redhat.com>
Approved-by: Michael Hofmann <mhofmann@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Lucas Zampieri <lzampier@redhat.com>

Author: zampierilucas

.gitlab-ci.yml

@@ -17,6 +17,7 @@ workflow: !reference [.workflow]
     native_tools: 'true'
     architectures: 'x86_64 ppc64le aarch64 s390x'
     debug_architectures: 'x86_64 ppc64le aarch64 s390x'
+    disttag_override: '.el9_5'
 
 .trigger_c9s_pipeline:
   trigger:

Makefile.rhelver

@@ -34,7 +34,7 @@ RHEL_RELEASE = 503
 #  (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

@@ -17,7 +17,7 @@ DIST_BRANCH ?= "main"
 
 # 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 ?= .el9
+DIST ?= .el9_5
 
 # This is a human readable distribution variable that is used to determine the
 # OS version (fedora, centos, or rhel).

redhat/self-test/data/centos-6161a435c191.el7

@@ -5,6 +5,7 @@ ARCHCONFIG=X86_64
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.12.0-0.rc4.6.test 
 BUILD=6 
+BUILDOPTS=+kabidupchk 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
 BUILD_TARGET=c9s-candidate 
@@ -81,6 +82,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v5.14 
 UPSTREAM_TARBALL_NAME=5.12-rc4 
 VERSION_ON_UPSTREAM=0 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
+YSTREAM_FLAG=no 
+ZSTREAM_FLAG=yes 
 _OUTPUT=.. 

redhat/self-test/data/centos-6161a435c191.el7.spec

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

redhat/self-test/data/centos-6161a435c191.fc25

@@ -5,6 +5,7 @@ ARCHCONFIG=X86_64
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.12.0-0.rc4.6.test 
 BUILD=6 
+BUILDOPTS=+kabidupchk 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
 BUILD_TARGET=c9s-candidate 
@@ -81,6 +82,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v5.14 
 UPSTREAM_TARBALL_NAME=5.12-rc4 
 VERSION_ON_UPSTREAM=0 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
+YSTREAM_FLAG=no 
+ZSTREAM_FLAG=yes 
 _OUTPUT=.. 

redhat/self-test/data/centos-6161a435c191.fc25.spec

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

redhat/self-test/data/centos-9f4ad9e425a1.el7

@@ -5,6 +5,7 @@ ARCHCONFIG=X86_64
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.12.0-6.test 
 BUILD=6 
+BUILDOPTS=+kabidupchk 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
 BUILD_TARGET=c9s-candidate 
@@ -81,6 +82,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v5.14 
 UPSTREAM_TARBALL_NAME=5.12 
 VERSION_ON_UPSTREAM=0 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
+YSTREAM_FLAG=no 
+ZSTREAM_FLAG=yes 
 _OUTPUT=.. 

redhat/self-test/data/centos-9f4ad9e425a1.el7.spec

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

redhat/self-test/data/centos-9f4ad9e425a1.fc25

@@ -5,6 +5,7 @@ ARCHCONFIG=X86_64
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.12.0-6.test 
 BUILD=6 
+BUILDOPTS=+kabidupchk 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
 BUILD_TARGET=c9s-candidate 
@@ -81,6 +82,6 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v5.14 
 UPSTREAM_TARBALL_NAME=5.12 
 VERSION_ON_UPSTREAM=0 
-YSTREAM_FLAG=yes 
-ZSTREAM_FLAG=no 
+YSTREAM_FLAG=no 
+ZSTREAM_FLAG=yes 
 _OUTPUT=..