[OS-BUILD PATCHv2 0/4] redhat: Fixup self-tests

[Prarit Bhargava (via Email Bridge)]

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

The merge window exposed a bug in the redhat/self-test/data/create-data.sh
script where the local variables were being reported instead of the test
variables.

Fix the create-data.sh script by moving the reporting of the
Makefile.variables into the dist-dump-variables target.  This has the
minor annoyance that dist-dump-variables will report Makefile.variables
twice when executed on the command line, however, it's something I think
we can live with.

In addition, the "Makefile contents" test needs to be adjusted because a
"?=" now appears in the redhat/Makefile.

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

---
 redhat/self-test/data/centos-2585cf9dfaad.el7  |  36 ++++++++----------------
 redhat/self-test/data/centos-2585cf9dfaad.fc25 |  36 ++++++++----------------
 redhat/self-test/data/centos-78e36f3b0dae.el7  |  34 +++++++----------------
 redhat/self-test/data/centos-78e36f3b0dae.fc25 |  34 +++++++----------------
 redhat/self-test/data/centos-df0cc57e057f.el7  |  36 ++++++++----------------
 redhat/self-test/data/centos-df0cc57e057f.fc25 |  36 ++++++++----------------
 redhat/self-test/data/centos-fce15c45d3fb.el7  |  34 +++++++----------------
 redhat/self-test/data/centos-fce15c45d3fb.fc25 |  34 +++++++----------------
 redhat/self-test/data/create-data.sh           |  35 +++++++++++-------------
 redhat/self-test/data/fedora-2585cf9dfaad.el7  |  37 +++++++++----------------
 redhat/self-test/data/fedora-2585cf9dfaad.fc25 |  37 +++++++++----------------
 redhat/self-test/data/fedora-78e36f3b0dae.el7  |  35 ++++++++----------------
 redhat/self-test/data/fedora-78e36f3b0dae.fc25 |  35 ++++++++----------------
 redhat/self-test/data/fedora-df0cc57e057f.el7  |  37 +++++++++----------------
 redhat/self-test/data/fedora-df0cc57e057f.fc25 |  37 +++++++++----------------
 redhat/self-test/data/fedora-fce15c45d3fb.el7  |  35 ++++++++----------------
 redhat/self-test/data/fedora-fce15c45d3fb.fc25 |  35 ++++++++----------------
 redhat/self-test/data/rhel-2585cf9dfaad.el7    |  37 +++++++++----------------
 redhat/self-test/data/rhel-2585cf9dfaad.fc25   |  37 +++++++++----------------
 redhat/self-test/data/rhel-78e36f3b0dae.el7    |  35 ++++++++----------------
 redhat/self-test/data/rhel-78e36f3b0dae.fc25   |  35 ++++++++----------------
 redhat/self-test/data/rhel-df0cc57e057f.el7    |  37 +++++++++----------------
 redhat/self-test/data/rhel-df0cc57e057f.fc25   |  37 +++++++++----------------
 redhat/self-test/data/rhel-fce15c45d3fb.el7    |  35 ++++++++----------------
 redhat/self-test/data/rhel-fce15c45d3fb.fc25   |  35 ++++++++----------------
 redhat/self-test/2001-dist-release.bats        |   2 +-
 redhat/self-test/3001-Makefile-contents.bats   |   2 +-
 redhat/Makefile                                |   3 +-
 28 files changed, 312 insertions(+), 586 deletions(-)

[OS-BUILD PATCHv2 1/4] redhat/self-test: Fix up create-data.sh to not report local variables

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: Fix up create-data.sh to not report local variables

Fix the create-data.sh script by moving the reporting of the
Makefile.variables into the dist-dump-variables target.  This has the
minor annoyance that dist-dump-variables will report Makefile.variables
twice when executed on the command line, however, it's something I think
we can live with.

Fix up create-data.sh to not report local variables.

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

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -714,7 +714,8 @@ dist-os-version:
 	@echo "OSVERSION: $(RHEL_MAJOR).$(RHEL_MINOR)"
 
 dist-dump-variables:
-	@$(foreach V,$(sort $(.VARIABLES)), $(if $(filter-out environment% default automatic,
$(origin $V)),$(info $V=$($V) )))
+	$(eval VARS:=$(sort $(shell cat Makefile.variables | sed '/^#/d; /^$$/d; s/[
]*[?:]=.*//')))
+	@$(foreach V,$(sort $(.VARIABLES)), $(if $(filter-out environment default automatic,
$(origin $V)),$(info $V=$($V) ),$(if $(filter $(VARS),$(V)),$(info $V=$($V)))))
 
 dist-self-test:
 	@if test -x /usr/bin/bats; then \
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
@@ -32,28 +32,25 @@ do
 
 			echo "building $varfilename"
 
-			# CURDIR is a make special target and cannot be easily changed.  Omit
-			# CURDIR from the output.
+			# Ignored Makefile variables:
+			# CURDIR is a make special target and cannot be easily changed.
 			# UPSTREAM is the base merge commit and can change from day-to-day as
-			# the tree is changed.  Omit UPSTREAM from the output.
+			# the tree is changed.
 			# RHEL_RELEASE can change build-to-build.
 			# SHELL can change depending on user's environment
-			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
-			# inherits the variables from the 'export' command in the redhat/Makefile.
-			# The 'dist-dump-variables' target explicitly omits these variables from
-			# its output.  As a workaround, read in the variables and output them to
-			# the data file.
-			# shellcheck disable=SC2002
-			cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR
-			do
-				[ "$VAR" == "RHDISTDATADIR" ] && continue
-				[ "$VAR" == "RHGITURL" ] && continue
-				[ "$VAR" == "BUILD" ] && continue
-				echo "$VAR=${!VAR}"
-			done >> "${varfilename}"
+			# 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
+			# and can be ignored.
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" |\
+				grep -v -w CURDIR |\
+				grep -v -w UPSTREAM |\
+				grep -v -w RHEL_RELEASE |\
+				grep -v -w SHELL |\
+				grep -v -w RHGITURL |\
+				grep -v -w RHDISTDATADIR |\
+				grep -v -w VARS |\
+				sort -u >& "${varfilename}"
 
 			echo "building ${varfilename}.spec"
 			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} setup-source

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

[OS-BUILD PATCHv2 2/4] redhat/self-test: self-test data update

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: self-test data update

Fixup the self-test data wrt the last commit.

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
@@ -1,11 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,11 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -6,6 +6,8 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -6,6 +6,8 @@ BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,11 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=df0cc57e057f 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD= 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,11 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-6.test 
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=df0cc57e057f 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD= 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -6,6 +6,8 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=fce15c45d3fb 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5-1-gfce15c45d3fb 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -6,6 +6,8 @@ BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test
 BUILD=6 
 BUILD_FLAGS= 
 BUILD_PROFILE=-p stream 
+BUILD_SCRATCH_TARGET=c9s-candidate 
+BUILD_TARGET=--scratch c9s-candidate 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -13,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 GL_FORK_PATH=kernel.git 
 GNUMAKEFLAGS= 
@@ -32,6 +36,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -43,6 +50,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=fce15c45d3fb 
+RHJOBS=1 
 RHPKG_BIN=centpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -69,32 +78,11 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5-1-gfce15c45d3fb 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=centos
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GNUMAKEFLAGS= 
 HEAD=2585cf9dfaad 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-rc5.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GNUMAKEFLAGS= 
 HEAD=2585cf9dfaad 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-rc5.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GNUMAKEFLAGS= 
 HEAD=78e36f3b0dae 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GNUMAKEFLAGS= 
 HEAD=78e36f3b0dae 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
 GNUMAKEFLAGS= 
 HEAD=df0cc57e057f 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=df0cc57e057f 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD= 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
 GNUMAKEFLAGS= 
 HEAD=df0cc57e057f 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=df0cc57e057f 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD= 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 GNUMAKEFLAGS= 
 HEAD=fce15c45d3fb 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=fce15c45d3fb 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5-1-gfce15c45d3fb 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test 
+BUILD_TARGET=--scratch temp-ark-rhel-8-test 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=fedora 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
 GNUMAKEFLAGS= 
 HEAD=fce15c45d3fb 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fb 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=fce15c45d3fb 
+RHJOBS=1 
 RHPKG_BIN=fedpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5.fce15c45d3fb. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5-1-gfce15c45d3fb 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=fedora
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign 
+BUILD_TARGET=--scratch rhel-9.99.0-test-pesign 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=rhel 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GNUMAKEFLAGS= 
 HEAD=2585cf9dfaad 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=rhpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=rhel
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -1,10 +1,13 @@
 .DEFAULT_GOAL=dist-cross-download 
-.SHELLSTATUS=1 
+.SHELLSTATUS=0 
 ARCHCONFIG=X86_64 
 ARCH_LIST=aarch64 ppc64le s390x x86_64 
 BASEVERSION=5.16.0-0.rc5.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign 
+BUILD_TARGET=--scratch rhel-9.99.0-test-pesign 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=rhel 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
 GNUMAKEFLAGS= 
 HEAD=2585cf9dfaad 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=2585cf9dfaad 
+RHJOBS=1 
 RHPKG_BIN=rhpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc5. 
+UPSTREAMBUILD_GIT_ONLY= 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-rc5 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=rhel
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
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
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign 
+BUILD_TARGET=--scratch rhel-9.99.0-test-pesign 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=rhel 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GNUMAKEFLAGS= 
 HEAD=78e36f3b0dae 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.el7 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=rhpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.el7
-DISTRO=rhel
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25
b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
@@ -5,6 +5,9 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
 BASEVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
 BUILD=6 
 BUILD_FLAGS= 
+BUILD_PROFILE= 
+BUILD_SCRATCH_TARGET=rhel-9.99.0-test-pesign 
+BUILD_TARGET=--scratch rhel-9.99.0-test-pesign 
 BUMP_RELEASE=yes 
 CHANGELOG_PREV=kernel.changelog-9.98 
 CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static
ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu
gcc-s390x-linux-gnu 
@@ -12,9 +15,11 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=rhel 
+DIST_BRANCH="os-build" 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
+GIT=git 
 GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
 GNUMAKEFLAGS= 
 HEAD=78e36f3b0dae 
@@ -30,6 +35,9 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=rhel DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+NO_CONFIGCHECKS= 
+PACKAGE_NAME=kernel 
+PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit" 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -41,6 +49,8 @@ RHDISTGIT_TMP=/tmp
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 
 RHEL_MINOR=99 
+RHGITCOMMIT=78e36f3b0dae 
+RHJOBS=1 
 RHPKG_BIN=rhpkg 
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
@@ -67,32 +77,11 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
 UPSTREAMBUILD=0.rc0.78e36f3b0dae. 
+UPSTREAMBUILD_GIT_ONLY=1 
+UPSTREAM_BRANCH=master 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 YSTREAM_FLAG=yes 
 ZSTREAM_FLAG=no 
 _OUTPUT=.. 
 _TAG=v5.16-11523-g78e36f3b0dae 
-DIST_BRANCH="os-build"
-DIST=.fc25
-DISTRO=rhel
-UPSTREAM_BRANCH=master
-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
-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=1
-RHGITCOMMIT=HEAD
-RHJOBS=1
-NO_CONFIGCHECKS=
-RHSELFTESTDATA=
-SINGLE_TARBALL=

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

[OS-BUILD PATCHv2 3/4] self-test: Fixup Makefile contents test

[Prarit Bhargava (via Email Bridge)]

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

self-test: Fixup Makefile contents test

The redhat/Makefile contains a "?=" that is caught up in the grep of the
Makefile contents test [1].

Ignore the match in the test.

[1] redhat/Makefile:716 @cat Makefile.variables | grep -v "^#" | sed
'/^$$/d' | tr -d " "  | awk -F "?=|:=" '{print $$1}' |
while read -r VAR ; do \
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/self-test/3001-Makefile-contents.bats
b/redhat/self-test/3001-Makefile-contents.bats
index blahblah..blahblah 100755
--- a/redhat/self-test/3001-Makefile-contents.bats
+++ b/redhat/self-test/3001-Makefile-contents.bats
@@ -9,7 +9,7 @@
 		exit 1
 	fi
 
-	value=$(git grep "?=" Makefile | wc -l)
+	value=$(git grep "?=" Makefile | grep -v "\"?=" | wc -l)
 	if [ $value -gt 0 ]; then
 		echo "Test failed: Makefile should not ?= declarations."
 		exit 1

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

[OS-BUILD PATCHv2 4/4] self-test: Fixup dist release test

[Prarit Bhargava (via Email Bridge)]

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

self-test: Fixup dist release test

The dist release test expects *one* BUILD value.  With the latest changes
it is possible that two are output.

Fix the dist release test to check only one BUILD value.

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

diff --git a/redhat/self-test/2001-dist-release.bats
b/redhat/self-test/2001-dist-release.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/2001-dist-release.bats
+++ b/redhat/self-test/2001-dist-release.bats
@@ -33,7 +33,7 @@
     title=${title##*\[redhat\] }
     # Strip off ...kernel-VV.PP.SS-:
     pkgrelease=${title##*kernel-+([5-9]).+([0-9]).+([0-9])-}
-    build=$(BUILD= DIST=.fc33 make dist-dump-variables | grep -E "^BUILD=" |
cut -d"=" -f2 | xargs)
+    build=$(BUILD= DIST=.fc33 make dist-dump-variables | grep -m 1 -E "^BUILD="
| cut -d"=" -f2 | xargs)
     ((build--))
     echo "pkgrelease=$pkgrelease"
     echo "build=$build"

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

[OS-BUILD PATCHv2 4/4] self-test: Fixup dist release test

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1800#note_9894...

I think you can drop this workaround/commit now since we are not outputting 2
times anymore.

[OS-BUILD PATCHv2 4/4] self-test: Fixup dist release test

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1800#note_9894...

also the changelog/mr description still lists it can output variables twice,
but it's not the case anymore with the updated makefile target.