[OS-BUILD PATCHv2 0/4] redhat/self-tests: Add self-tests to gitlab-ci.yaml

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

The test directory is already out-of-date with respect to changes make to
the spec file.  To avoid this happening with future changes, add the
execution of the self-tests to gitlab-ci.yaml.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

---
 redhat/self-test/data/centos-2585cf9dfaad.el7       |  15 +++----
 redhat/self-test/data/centos-2585cf9dfaad.el7.spec  |  14 ++++++-
 redhat/self-test/data/centos-2585cf9dfaad.fc25      |  15 +++----
 redhat/self-test/data/centos-2585cf9dfaad.fc25.spec |  14 ++++++-
 redhat/self-test/data/centos-78e36f3b0dae.el7       |  42 ++++++++++-----------
 redhat/self-test/data/centos-78e36f3b0dae.el7.spec  |  22 ++++++++---
 redhat/self-test/data/centos-78e36f3b0dae.fc25      |  42 ++++++++++-----------
 redhat/self-test/data/centos-78e36f3b0dae.fc25.spec |  22 ++++++++---
 redhat/self-test/data/centos-df0cc57e057f.el7       |  15 +++----
 redhat/self-test/data/centos-df0cc57e057f.el7.spec  |  14 ++++++-
 redhat/self-test/data/centos-df0cc57e057f.fc25      |  15 +++----
 redhat/self-test/data/centos-df0cc57e057f.fc25.spec |  14 ++++++-
 redhat/self-test/data/centos-fce15c45d3fb.el7       |  42 ++++++++++-----------
 redhat/self-test/data/centos-fce15c45d3fb.el7.spec  |  22 ++++++++---
 redhat/self-test/data/centos-fce15c45d3fb.fc25      |  42 ++++++++++-----------
 redhat/self-test/data/centos-fce15c45d3fb.fc25.spec |  22 ++++++++---
 redhat/self-test/data/create-data.sh                |  21 +++++++---
 redhat/self-test/data/fedora-2585cf9dfaad.el7       |  15 +++----
 redhat/self-test/data/fedora-2585cf9dfaad.el7.spec  |  14 ++++++-
 redhat/self-test/data/fedora-2585cf9dfaad.fc25      |  15 +++----
 redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec |  14 ++++++-
 redhat/self-test/data/fedora-78e36f3b0dae.el7       |  42 ++++++++++-----------
 redhat/self-test/data/fedora-78e36f3b0dae.el7.spec  |  22 ++++++++---
 redhat/self-test/data/fedora-78e36f3b0dae.fc25      |  42 ++++++++++-----------
 redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec |  22 ++++++++---
 redhat/self-test/data/fedora-df0cc57e057f.el7       |  15 +++----
 redhat/self-test/data/fedora-df0cc57e057f.el7.spec  |  14 ++++++-
 redhat/self-test/data/fedora-df0cc57e057f.fc25      |  15 +++----
 redhat/self-test/data/fedora-df0cc57e057f.fc25.spec |  14 ++++++-
 redhat/self-test/data/fedora-fce15c45d3fb.el7       |  42 ++++++++++-----------
 redhat/self-test/data/fedora-fce15c45d3fb.el7.spec  |  22 ++++++++---
 redhat/self-test/data/fedora-fce15c45d3fb.fc25      |  42 ++++++++++-----------
 redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec |  22 ++++++++---
 redhat/self-test/data/rhel-2585cf9dfaad.el7         |  15 +++----
 redhat/self-test/data/rhel-2585cf9dfaad.el7.spec    |  14 ++++++-
 redhat/self-test/data/rhel-2585cf9dfaad.fc25        |  15 +++----
 redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec   |  14 ++++++-
 redhat/self-test/data/rhel-78e36f3b0dae.el7         |  42 ++++++++++-----------
 redhat/self-test/data/rhel-78e36f3b0dae.el7.spec    |  22 ++++++++---
 redhat/self-test/data/rhel-78e36f3b0dae.fc25        |  42 ++++++++++-----------
 redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec   |  22 ++++++++---
 redhat/self-test/data/rhel-df0cc57e057f.el7         |  15 +++----
 redhat/self-test/data/rhel-df0cc57e057f.el7.spec    |  14 ++++++-
 redhat/self-test/data/rhel-df0cc57e057f.fc25        |  15 +++----
 redhat/self-test/data/rhel-df0cc57e057f.fc25.spec   |  14 ++++++-
 redhat/self-test/data/rhel-fce15c45d3fb.el7         |  42 ++++++++++-----------
 redhat/self-test/data/rhel-fce15c45d3fb.el7.spec    |  22 ++++++++---
 redhat/self-test/data/rhel-fce15c45d3fb.fc25        |  42 ++++++++++-----------
 redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec   |  22 ++++++++---
 .gitlab-ci.yml                                      |   1 +
 50 files changed, 675 insertions(+), 463 deletions(-)

[OS-BUILD PATCHv2 1/4] redhat/self-test: Omit SHELL variable from test data

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/self-test: Omit SHELL variable from test data

The SHELL variable reports the shell that is executed by the user.  This
obviously may vary from user to user, so it can be dropped.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -29,8 +29,9 @@ do
 			# UPSTREAM is the base merge commit and can change from day-to-day as
 			# the tree is changed.  Omit UPSTREAM from the output.
 			# RHEL_RELEASE can change build-to-build.
+			# SHELL can change depending on user's environment
 			unset SINGLE_TARBALL
-			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE >& "${varfilename}"
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE | grep -v -w SHELL >&
"${varfilename}"
 
 			# When executed from a script, the variables in Makefile.variables are
 			# listed as having origin 'environment'.  This is because the script
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
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
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
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7
b/redhat/self-test/data/rhel-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7
b/redhat/self-test/data/rhel-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

[OS-BUILD PATCHv2 2/4] redhat/self-test: Unset Makefile variables

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/self-test: Unset Makefile variables

While testing I noticed that the redhat/self-test/data had
UPSTREAMBUILD_GIT_ONLY always set to "1".  This occurs because the
Makefile variables are passed into the create-data.sh script.  They need
to be unset before the data is generated.

Unset the Makefile variables.

Additional fix: Move the RHDISTDATADIR check below the script description.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

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
@@ -1,7 +1,5 @@
 #!/usr/bin/bash
 
-[ -z "${RHDISTDATADIR}" ] && echo "ERROR: RHDISTDATADIR
undefined." && exit 1
-
 # This script generates 'dist-dump-variables' output for various configurations
 # using known ark commit IDs.  It uses this information as well as setting
 # different values for DISTRO and DIST.
@@ -14,13 +12,23 @@
 #    fce15c45d3fb := 5.16-rc5 + 2 additional commits
 #
 
+[ -z "${RHDISTDATADIR}" ] && echo "ERROR: RHDISTDATADIR
undefined." && exit 1
+
+# Store variables used in *this* script before unsetting them below.
+destdir="${RHDISTDATADIR}"
+specfile="${SOURCES}"/kernel.spec
+
+# unset all redhat/Makefile variables so they do not interfere with make targets below
+makefile_vars=$(unset SINGLE_TARBALL; make dist-dump-variables | grep "=" | cut
-d"=" -f1)
+while read -r VAR; do unset "$VAR"; done < <(echo
"$makefile_vars")
+
 for DISTRO in fedora rhel centos
 do
 	for commit in 78e36f3b0dae 2585cf9dfaad df0cc57e057f fce15c45d3fb
 	do
 		for DIST in .fc25 .el7
 		do
-			varfilename="${RHDISTDATADIR}/${DISTRO}-${commit}${DIST}"
+			varfilename="${destdir}/${DISTRO}-${commit}${DIST}"
 
 			echo "building $varfilename"
 
@@ -30,7 +38,6 @@ do
 			# the tree is changed.  Omit UPSTREAM from the output.
 			# RHEL_RELEASE can change build-to-build.
 			# SHELL can change depending on user's environment
-			unset SINGLE_TARBALL
 			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE | grep -v -w SHELL >&
"${varfilename}"
 
 			# When executed from a script, the variables in Makefile.variables are
@@ -49,9 +56,8 @@ do
 			done >> "${varfilename}"
 
 			echo "building ${varfilename}.spec"
-			unset SINGLE_TARBALL
 			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} setup-source
-			cp "${SOURCES}"/kernel.spec "${varfilename}".spec
+			cp "$specfile" "${varfilename}".spec
 		done
 	done
 done

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

[OS-BUILD PATCHv2 3/4] redhat/self-test: Update data

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/self-test: Update data

Update data due to recent changes in the redhat/Makefile, kernel specfile,
and redhat/self-test/data/create-data.sh.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

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
@@ -79,20 +79,20 @@ DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -79,20 +79,20 @@ DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -2,7 +2,7 @@
 .SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
@@ -23,20 +23,20 @@ HEAD=78e36f3b0dae
 INCLUDE_FEDORA_FILES=1 
 INCLUDE_RHEL_FILES=1 
 KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2

-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2

+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2

+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2

 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae586 
+MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test 
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
 RHDISTGIT=[e-mail]:/kernel.git 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_TMP=/tmp 
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
+SPECBUILD=0.rc0.78e36f3b0dae.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECINCLUDE_FEDORA_FILES=1 
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASED_KERNEL=0 
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
 SPECVERSION=5.17.0 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAMBUILD=0.rc0.78e36f3b0dae586. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
+UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae586 
+_TAG=v5.16-11523-g78e36f3b0dae 
 DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae.6.test
 %define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
 # This is needed to do merge window version magic
 %define patchlevel 17
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -2,7 +2,7 @@
 .SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
+BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
@@ -23,20 +23,20 @@ HEAD=78e36f3b0dae
 INCLUDE_FEDORA_FILES=1 
 INCLUDE_RHEL_FILES=1 
 KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2

-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2

+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2

+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2

 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae586 
+MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test 
+RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae.6.test 
 RHDISTGIT=[e-mail]:/kernel.git 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_TMP=/tmp 
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
+SPECBUILD=0.rc0.78e36f3b0dae.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECINCLUDE_FEDORA_FILES=1 
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=17
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASED_KERNEL=0 
-SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
+SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
 SPECVERSION=5.17.0 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
-TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz 
+TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAMBUILD=0.rc0.78e36f3b0dae586. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
+UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae586 
+_TAG=v5.16-11523-g78e36f3b0dae 
 DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define buildid .test
 %define specversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae.6.test
 %define kversion 5
-%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae586.6.test
+%define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test
 # This is needed to do merge window version magic
 %define patchlevel 17
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -79,20 +79,20 @@ DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -79,20 +79,20 @@ DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -2,7 +2,7 @@
 .SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
@@ -23,20 +23,20 @@ HEAD=fce15c45d3fb
 INCLUDE_FEDORA_FILES=1 
 INCLUDE_RHEL_FILES=1 
 KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2

-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2

+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2

+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2

 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fbd9f 
+MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
 RHDISTGIT=[e-mail]:/kernel.git 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_TMP=/tmp 
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
+SPECBUILD=0.rc5.fce15c45d3fb.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECINCLUDE_FEDORA_FILES=1 
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASED_KERNEL=0 
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
 SPECVERSION=5.16.0 
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
+UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fbd9f 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
 DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
+%define pkgrelease 0.rc5.fce15c45d3fb.6.test
 %define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
 # This is needed to do merge window version magic
 %define patchlevel 16
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -2,7 +2,7 @@
 .SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
-BASEVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
@@ -23,20 +23,20 @@ HEAD=fce15c45d3fb
 INCLUDE_FEDORA_FILES=1 
 INCLUDE_RHEL_FILES=1 
 KABIDW=../redhat/kabi-dwarf 
-KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2

-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2

+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2

+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2

 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=fce15c45d3fbd9f 
+MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASED_KERNEL=0 
-RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fb.6.test 
 RHDISTGIT=[e-mail]:/kernel.git 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_TMP=/tmp 
@@ -50,7 +50,7 @@ RPMBUILD=rpmbuild
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
-SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
+SPECBUILD=0.rc5.fce15c45d3fb.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECINCLUDE_FEDORA_FILES=1 
@@ -60,40 +60,39 @@ SPECKPATCHLEVEL=16
 SPECKSUBLEVEL=0 
 SPECKVERSION=5 
 SPECRELEASED_KERNEL=0 
-SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
+SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
 SPECVERSION=5.16.0 
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
-TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz 
+TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAMBUILD=0.rc5.fce15c45d3fbd9f. 
-UPSTREAMBUILD_GIT_ONLY=1 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
+UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fbd9f 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
 DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=centos
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define buildid .test
 %define specversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
+%define pkgrelease 0.rc5.fce15c45d3fb.6.test
 %define kversion 5
-%define tarfile_release 5.16.0-0.rc5.fce15c45d3fbd9f.6.test
+%define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test
 # This is needed to do merge window version magic
 %define patchlevel 16
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
@@ -3024,7 +3034,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fbd9f.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -77,20 +77,20 @@ DIST_BRANCH="os-build"
 DIST=.el7
 DISTRO=fedora
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;
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
@@ -77,20 +77,20 @@ DIST_BRANCH="os-build"
 DIST=.fc25
 DISTRO=fedora
 UPSTREAM_BRANCH=master
-VERSION_ON_UPSTREAM=1
-RELEASED_KERNEL=0
-BUMP_RELEASE=yes
-INCLUDE_FEDORA_FILES=1
-INCLUDE_RHEL_FILES=1
+VERSION_ON_UPSTREAM=
+RELEASED_KERNEL=
+BUMP_RELEASE=
+INCLUDE_FEDORA_FILES=
+INCLUDE_RHEL_FILES=
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git -c "core.abbrev=15"
+GIT=git
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
 BUILD_PROFILE=
 BUILD_FLAGS=
-UPSTREAMBUILD_GIT_ONLY=
+UPSTREAMBUILD_GIT_ONLY=1
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -653,6 +653,10 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl
 %if %{signkernel}
+# ELN uses Fedora signing process, so exclude
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+BuildRequires: system-sb-certs
+%endif
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -2292,7 +2296,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding
net/mptcp netfilter tc-testing" SKIP_TARGETS=""
INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}"
install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -2347,7 +2351,7 @@ find Documentation -type d | xargs chmod u+w
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
-    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} xz; \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs
-P${RPM_BUILD_NCPUS} -r xz; \
   fi \
 %{nil}
 
@@ -2572,6 +2576,12 @@ find . -type f -executable -exec install -m755 {}
%{buildroot}%{_libexecdir}/ksa
 find . -type f ! -executable -exec install -m644 {}
%{buildroot}%{_libexecdir}/ksamples/pktgen/{} \;
 popd
 popd
+# install vm selftests
+pushd tools/testing/selftests/vm
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f -executable -exec install -D -m755 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+find -type f ! -executable -exec install -D -m644 {}
%{buildroot}%{_libexecdir}/kselftests/vm/{} \;
+popd
 # install drivers/net/mlxsw selftests
 pushd tools/testing/selftests/drivers/net/mlxsw
 find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{}
\;

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

[OS-BUILD PATCHv2 4/4] redhat: Add self-tests to .gitlab-ci.yml

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat: Add self-tests to .gitlab-ci.yml

Add a run of the self-tests to .gitlab-ci.yml to avoid the test data
getting stale.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ workflow:
     builder_image: registry.gitlab.com/cki-project/containers/builder-rawhide
     builder_image_tag: latest
     srpm_make_target: dist-srpm
+    run_redhat_self_test : 'true'
     # We only need srpm so skip the rest of the stages
     skip_build: 'true'
     skip_publish: 'true'

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

[Don Zickus (via Email Bridge)]

From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741#note_9549...

I don't know who or what was originally blocking this thread, but I believe it
to be resolved (at least Prarit and Veronika appear to think things are good).
So I am clicking the resolve button. :-)

[Don Zickus (via Email Bridge)]

From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741#note_9549...

@jmflinuxtx - up to you if you want to sneak this in before Monday's merge
window opening.  The last commit in this series is the piece that enables the
cki part (run_self_test: true).  So reverting that patch disables this from
any MRs next week.  Up to you.  Otherwise we can wait until -rc2.