Skip to content

Commit afdb31d

Browse files
author
CKI KWF Bot
committed
Merge: redhat: bump RHEL_MINOR to 8
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7300 JIRA: INTERNAL Upstream status: RHEL-only 9.7 has branched. Signed-off-by: Patrick Talbert <ptalbert@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Julio Faracco <jfaracco@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 40d1cbd + 9569352 commit afdb31d

26 files changed

+65
-65
lines changed

Makefile.rhelver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
RHEL_MAJOR = 9
2-
RHEL_MINOR = 7
2+
RHEL_MINOR = 8
33

44
#
55
# RHEL_RELEASE

redhat/kernel.changelog-9.8

Whitespace-only changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-0.rc4.6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=6161a435c191
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=0.rc4.6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-0.rc4.6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=6161a435c191
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=0.rc4.6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=9f4ad9e425a1
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=9f4ad9e425a1
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

redhat/self-test/data/centos-a5e13c6df0e4.el7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-0.rc5.6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=a5e13c6df0e4
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=0.rc5.6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

redhat/self-test/data/centos-a5e13c6df0e4.fc25

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-0.rc5.6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=a5e13c6df0e4
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=0.rc5.6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

redhat/self-test/data/centos-edc9dd1e3c31.el7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=edc9dd1e3c31
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

redhat/self-test/data/centos-edc9dd1e3c31.fc25

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RELEASETAG=kernel-5.12.0-6.test
4848
RHDISTGIT_BRANCH=c9s
4949
RHDISTGIT_USER="shadowman"
5050
RHEL_MAJOR=9
51-
RHEL_MINOR=7
51+
RHEL_MINOR=8
5252
RHGITCOMMIT=edc9dd1e3c31
5353
RHJOBS=1
5454
RHPKG_BIN=centpkg
@@ -58,7 +58,7 @@ RPMBUILD=rpmbuild
5858
SNAPSHOT=0
5959
SOURCES=../redhat/rpm/SOURCES
6060
SPECBUILD=6.test
61-
SPECCHANGELOG=kernel.changelog-9.7
61+
SPECCHANGELOG=kernel.changelog-9.8
6262
SPECFILE=kernel.spec
6363
SPECINCLUDE_FEDORA_FILES=0
6464
SPECINCLUDE_RHEL_FILES=1

0 commit comments

Comments
 (0)