Merge: Update 9.6 selt-tests

emmil · emmil · commit bc8bdaf37988 · 2024-09-06T14:23:12.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5144 JIRA: INTERNAL Upstream Status: RHEL only During our 9.5 to 9.6 transition we made a mistake and generate incorect self-data tests, this commits fixes those. Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Approved-by: Patrick Talbert <ptalbert@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
diff --git a/redhat/self-test/data/centos-6161a435c191.el7 b/redhat/self-test/data/centos-6161a435c191.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc4.6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test.el7 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-6161a435c191.fc25 b/redhat/self-test/data/centos-6161a435c191.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc4.6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test.fc25 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-9f4ad9e425a1.el7 b/redhat/self-test/data/centos-9f4ad9e425a1.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.el7 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-9f4ad9e425a1.fc25 b/redhat/self-test/data/centos-9f4ad9e425a1.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.fc25 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-a5e13c6df0e4.el7 b/redhat/self-test/data/centos-a5e13c6df0e4.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc5.6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test.el7 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-a5e13c6df0e4.fc25 b/redhat/self-test/data/centos-a5e13c6df0e4.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc5.6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test.fc25 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-edc9dd1e3c31.el7 b/redhat/self-test/data/centos-edc9dd1e3c31.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.el7 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/centos-edc9dd1e3c31.fc25 b/redhat/self-test/data/centos-edc9dd1e3c31.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.fc25 
 DISTRO=centos 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-6161a435c191.el7 b/redhat/self-test/data/fedora-6161a435c191.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc4.6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-6161a435c191.fc25 b/redhat/self-test/data/fedora-6161a435c191.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc4.6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-9f4ad9e425a1.el7 b/redhat/self-test/data/fedora-9f4ad9e425a1.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-9f4ad9e425a1.fc25 b/redhat/self-test/data/fedora-9f4ad9e425a1.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-a5e13c6df0e4.el7 b/redhat/self-test/data/fedora-a5e13c6df0e4.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc5.6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-a5e13c6df0e4.fc25 b/redhat/self-test/data/fedora-a5e13c6df0e4.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc5.6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-edc9dd1e3c31.el7 b/redhat/self-test/data/fedora-edc9dd1e3c31.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/fedora-edc9dd1e3c31.fc25 b/redhat/self-test/data/fedora-edc9dd1e3c31.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test 
 DISTRO=fedora 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-6161a435c191.el7 b/redhat/self-test/data/rhel-6161a435c191.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc4.6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test.el7 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-6161a435c191.fc25 b/redhat/self-test/data/rhel-6161a435c191.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc4.6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc4.6.test.fc25 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-9f4ad9e425a1.el7 b/redhat/self-test/data/rhel-9f4ad9e425a1.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.el7 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-9f4ad9e425a1.fc25 b/redhat/self-test/data/rhel-9f4ad9e425a1.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.fc25 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-a5e13c6df0e4.el7 b/redhat/self-test/data/rhel-a5e13c6df0e4.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-0.rc5.6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test.el7 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-a5e13c6df0e4.fc25 b/redhat/self-test/data/rhel-a5e13c6df0e4.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-0.rc5.6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-0.rc5.6.test.fc25 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-edc9dd1e3c31.el7 b/redhat/self-test/data/rhel-edc9dd1e3c31.el7
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTBASEVERSION=5.12.0-6.test.el7 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.el7 
 DISTRO=rhel 
 DIST_BRANCH="main" 
diff --git a/redhat/self-test/data/rhel-edc9dd1e3c31.fc25 b/redhat/self-test/data/rhel-edc9dd1e3c31.fc25
@@ -15,7 +15,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTBASEVERSION=5.12.0-6.test.fc25 
-DISTLOCALVERSION=.test 
 DISTRELEASETAG=kernel-5.12.0-6.test.fc25 
 DISTRO=rhel 
 DIST_BRANCH="main" 
