From: Patrick Talbert on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2550
These variables are derived from the environment and may change over time.
Fixes: #114
Signed-off-by: Patrick Talbert ptalbert@redhat.com
--- redhat/self-test/data/centos-2585cf9dfaad.el7 | 1 - redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 1 - redhat/self-test/data/centos-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 1 - redhat/self-test/data/centos-78e36f3b0dae.el7 | 1 - redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 1 - redhat/self-test/data/centos-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 1 - redhat/self-test/data/centos-df0cc57e057f.el7 | 1 - redhat/self-test/data/centos-df0cc57e057f.el7.spec | 1 - redhat/self-test/data/centos-df0cc57e057f.fc25 | 1 - redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 1 - redhat/self-test/data/centos-fce15c45d3fb.el7 | 1 - redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 1 - redhat/self-test/data/centos-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 1 - redhat/self-test/data/create-data.sh | 4 ++++ redhat/self-test/data/fedora-2585cf9dfaad.el7 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 1 - redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 1 - redhat/self-test/data/fedora-78e36f3b0dae.el7 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 - redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 - redhat/self-test/data/fedora-df0cc57e057f.el7 | 1 - redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 1 - redhat/self-test/data/fedora-df0cc57e057f.fc25 | 1 - redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 1 - redhat/self-test/data/fedora-fce15c45d3fb.el7 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 - redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 - redhat/self-test/data/rhel-2585cf9dfaad.el7 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 1 - redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 1 - redhat/self-test/data/rhel-78e36f3b0dae.el7 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 1 - redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 1 - redhat/self-test/data/rhel-df0cc57e057f.el7 | 1 - redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 1 - redhat/self-test/data/rhel-df0cc57e057f.fc25 | 1 - redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 1 - redhat/self-test/data/rhel-fce15c45d3fb.el7 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 1 - redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 1 - 49 files changed, 4 insertions(+), 48 deletions(-)
From: Patrick Talbert ptalbert@redhat.com
redhat: ignore SPECBPFTOOLVERSION/bpftoolversion in self-test create-data.sh
These variables are derived from the environment and may change over time.
Signed-off-by: Patrick Talbert ptalbert@redhat.com
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh index blahblah..blahblah 100755 --- a/redhat/self-test/data/create-data.sh +++ b/redhat/self-test/data/create-data.sh @@ -30,6 +30,8 @@ specfile_helper () { cp ./kernel.spec.template "${varfilename}.spec.template" make RHSELFTESTDATA=1 SPECFILE="${specfilename}.spec" DIST="${DIST}" DISTRO="${DISTRO}" HEAD="${commit}" _setup-source grep -Fvx -f "${specfilename}.spec.template" "${sources}/${specfilename}.spec" > "${destdir}"/"${specfilename}".spec + # Ignore bpftoolversion definition as it may change. + sed -i '/^%define bpftoolversion /d' "${destdir}"/"${specfilename}".spec rm -f "${specfilename}.spec.template" }
@@ -49,6 +51,7 @@ do # the tree is changed. # RHEL_RELEASE can change build-to-build. # SHELL can change depending on user's environment + # SPECBPFTOOLVERSION is derived from tools/lib/bpf/Makefile and may change. # RHGITURL may change depending on the user's method of cloning # RHDISTDATADIR will change based on these tests # VARS is a list of variables added for the 'dist-dump-variables' target @@ -58,6 +61,7 @@ do grep -v -w UPSTREAM |\ grep -v -w RHEL_RELEASE |\ grep -v -w SHELL |\ + grep -v -w SPECBPFTOOLVERSION |\ grep -v -w RHGITURL |\ grep -v -w RHDISTDATADIR |\ grep -v -w VARS |\
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2550
From: Patrick Talbert ptalbert@redhat.com
redhat: update self-test data
Update the self-test data now that we ignore the bpf toolversion vars.
Signed-off-by: Patrick Talbert ptalbert@redhat.com
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.6%{?buildid}%{?dist} %define kabiversion 5.16.0-0.rc5.6.test.el7 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.6.test] diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.6%{?buildid}%{?dist} %define kabiversion 5.16.0-0.rc5.6.test.fc25 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.6.test] diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} %define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.el7 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.17.0-0.rc0.78e36f3b0dae.6.test] diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc0.78e36f3b0dae.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} %define kabiversion 5.17.0-0.rc0.78e36f3b0dae.6.test.fc25 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.17.0-0.rc0.78e36f3b0dae.6.test] diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec @@ -16,5 +16,4 @@ %define specrelease 6%{?buildid}%{?dist} %define kabiversion 5.16.0-6.test.el7 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-6.test] diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec @@ -16,5 +16,4 @@ %define specrelease 6%{?buildid}%{?dist} %define kabiversion 5.16.0-6.test.fc25 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-6.test] diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} %define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.el7 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.fce15c45d3fb.6.test] diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.fce15c45d3fb.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} %define kabiversion 5.16.0-0.rc5.fce15c45d3fb.6.test.fc25 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.fce15c45d3fb.6.test] diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.6%{?buildid}%{?dist} %define kabiversion 5.16.0 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.6.test] diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -69,7 +69,6 @@ RPM=../redhat/rpm RPMBUILD=rpmbuild SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES -SPECBPFTOOLVERSION=7.2.0 SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec @@ -16,5 +16,4 @@ %define specrelease 0.rc5.6%{?buildid}%{?dist} %define kabiversion 5.16.0 %define selftests_must_build 0 -%define bpftoolversion 7.2.0 Mon Mar 28 2022 Fedora Kernel Team kernel-team@fedoraproject.org [5.16.0-0.rc5.6.test]
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2550
From: Radu Rendec on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2550#note_1451941...
The pipeline failures are related to #114 (fixed in !2550).
kernel@lists.fedoraproject.org