[OS-BUILD PATCHv5 0/8] redhat/self-test: Add new tests

[Prarit Bhargava (via Email Bridge)]

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

Making changes to the Makefiles has been difficult and revealed minor
issues with even the simplest of changes.  Having a test that compares the
Makefile variables to a "known good" set, and being able to compare the
kernel spec file to a "known good" spec file will help with testing future
changes.


I have chosen these 4 ARK commits to test with because they result in
different
versioning in the variables and the kernel specfile:

   78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
        result: 5.17.0-0.rc0.78e36f3b0dae.6.test
   2585cf9dfaad := 5.16-rc5
        result: 5.16.0-0.rc5.6.test
   df0cc57e057f := 5.16
        result: 5.16.0-6.test
   fce15c45d3fb := 5.16-rc5 + 2 additional commits
        result: 5.16.0-0.rc5.fce15c45d3fb.6.test

This changeset provides a better "dist-dump-variables" test that also
compares the resulting spec files.  The test code does introduce two new
Makefile.variables entries both of which are clearly marked as unstable.

The genspec.sh change is minor, and is just a reorganization of the code
to speed up the creation of test files.

As indicated in the last commit, changelog generation is not yet tested.
That will come at a later date.  Additional tests beyond these tests will
also be added at a later date.

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

---
 redhat/self-test/data/centos-2585cf9dfaad.el7       |   100 +
 redhat/self-test/data/centos-2585cf9dfaad.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-2585cf9dfaad.fc25      |   100 +
 redhat/self-test/data/centos-2585cf9dfaad.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-78e36f3b0dae.el7       |   100 +
 redhat/self-test/data/centos-78e36f3b0dae.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-78e36f3b0dae.fc25      |   100 +
 redhat/self-test/data/centos-78e36f3b0dae.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-df0cc57e057f.el7       |   100 +
 redhat/self-test/data/centos-df0cc57e057f.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-df0cc57e057f.fc25      |   100 +
 redhat/self-test/data/centos-df0cc57e057f.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-fce15c45d3fb.el7       |   100 +
 redhat/self-test/data/centos-fce15c45d3fb.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/centos-fce15c45d3fb.fc25      |   100 +
 redhat/self-test/data/centos-fce15c45d3fb.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/create-data.sh                |    54 +
 redhat/self-test/data/fedora-2585cf9dfaad.el7       |    98 +
 redhat/self-test/data/fedora-2585cf9dfaad.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-2585cf9dfaad.fc25      |    98 +
 redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-78e36f3b0dae.el7       |    98 +
 redhat/self-test/data/fedora-78e36f3b0dae.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-78e36f3b0dae.fc25      |    98 +
 redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-df0cc57e057f.el7       |    98 +
 redhat/self-test/data/fedora-df0cc57e057f.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-df0cc57e057f.fc25      |    98 +
 redhat/self-test/data/fedora-df0cc57e057f.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-fce15c45d3fb.el7       |    98 +
 redhat/self-test/data/fedora-fce15c45d3fb.el7.spec  |  3032 +++++++++++++++++++
 redhat/self-test/data/fedora-fce15c45d3fb.fc25      |    98 +
 redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-2585cf9dfaad.el7         |    98 +
 redhat/self-test/data/rhel-2585cf9dfaad.el7.spec    |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-2585cf9dfaad.fc25        |    98 +
 redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec   |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-78e36f3b0dae.el7         |    98 +
 redhat/self-test/data/rhel-78e36f3b0dae.el7.spec    |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-78e36f3b0dae.fc25        |    98 +
 redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec   |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-df0cc57e057f.el7         |    98 +
 redhat/self-test/data/rhel-df0cc57e057f.el7.spec    |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-df0cc57e057f.fc25        |    98 +
 redhat/self-test/data/rhel-df0cc57e057f.fc25.spec   |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-fce15c45d3fb.el7         |    98 +
 redhat/self-test/data/rhel-fce15c45d3fb.el7.spec    |  3032 +++++++++++++++++++
 redhat/self-test/data/rhel-fce15c45d3fb.fc25        |    98 +
 redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec   |  3032 +++++++++++++++++++
 redhat/self-test/1005-dist-dump-variables.bats      |    59 +-
 redhat/Makefile                                     |    19 +-
 redhat/Makefile.rhpkg                               |     6 +-
 redhat/Makefile.variables                           |    10 +-
 redhat/genspec.sh                                   |   150 +-
 54 files changed, 75306 insertions(+), 128 deletions(-)

[OS-BUILD PATCHv5 1/8] redhat/self-test: Add variable test data

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: Add variable test data

Add test data for various release types, a script to create the data, and
a Makefile target.  This data will be used as a baseline for testing of
Makefile changes.

Note: By default, 'make self-test-data' outputs absolute paths.  The
modification to TOPDIR allows relative path information which results in
generic test data.  When RHSELFTESTDATA is set TOPDIR is ../
instead of, for example, '/home/prarit/path/to/directory/kernel/ark', and
RHDISTGIT_USER is set to "shadowman".

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
@@ -21,7 +21,11 @@ endif
 include Makefile.variables
 
 LANG=C
-TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
+ifndef RHSELFTESTDATA
+  TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
+else
+  TOPDIR:=..
+endif
 REDHAT:=$(TOPDIR)/redhat
 include $(TOPDIR)/Makefile.rhelver
 
@@ -650,6 +654,9 @@ dist-self-test:
 		echo "dist-self-test: The bats package is not installed" ; \
 	fi
 
+dist-self-test-data:
+	./self-test/data/create-data.sh ${REDHAT}/self-test/data
+
 dist-help:
 	@echo  'Cleaning targets:'
 	@echo  '  dist-clean          - Clean redhat/configs/ and redhat/rpm/
directories.'
diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg
index blahblah..blahblah 100644
--- a/redhat/Makefile.rhpkg
+++ b/redhat/Makefile.rhpkg
@@ -10,7 +10,11 @@ else
 	RHPKG_BIN:=rhpkg
 endif
 # Kerberos username for pkgs.devel.redhat.com
-RHDISTGIT_USER:="$(shell whoami)"
+ifndef RHSELFTESTDATA
+  RHDISTGIT_USER:="$(shell whoami)"
+else
+  RHDISTGIT_USER:="shadowman"
+endif
 # Local dist-git _clean_ clone. To be used when updating dist-git
 #RHDISTGIT_CACHE:=
 # Temporary directory to clone the dist-git repo to. Change this if you
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -119,3 +119,7 @@ RHJOBS ?=
 
 # This disables the CONFIG error checking in redhat/configs/process_configs.sh.
 NO_CONFIGCHECKS ?=
+
+# This variable is only used to create self-test data.  It should not be
+# considered stable and may be changed or removed without warning.
+RHSELFTESTDATA ?=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=centos 
+DISTRO_BUILD=0.rc5.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+HEAD=2585cf9dfaad 
+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.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 
+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
+MARKER=v5.16-rc5 
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+PKGRELEASE=0.rc5.6.test 
+PREBUILD=0.rc5. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-0.rc5.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=centos 
+DISTRO_BUILD=0.rc5.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+HEAD=2585cf9dfaad 
+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.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 
+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=v5.16-rc5 
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+PKGRELEASE=0.rc5.6.test 
+PREBUILD=0.rc5. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-0.rc5.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=centos 
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+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.78e36f3b0dae.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

+KEXTRAVERSION=.rc0 
+KVERSION=5.17.0 
+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=78e36f3b0dae 
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
+PREBUILD=0.rc0.78e36f3b0dae. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=17 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
+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.78e36f3b0dae.6.test.tar.xz 
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-11523-g78e36f3b0dae 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=centos 
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+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.78e36f3b0dae.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

+KEXTRAVERSION=.rc0 
+KVERSION=5.17.0 
+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=78e36f3b0dae 
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
+PREBUILD=0.rc0.78e36f3b0dae. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=17 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
+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.78e36f3b0dae.6.test.tar.xz 
+TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz 
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-11523-g78e36f3b0dae 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=centos 
+DISTRO_BUILD=6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+HEAD=df0cc57e057f 
+INCLUDE_FEDORA_FILES=1 
+INCLUDE_RHEL_FILES=1 
+KABIDW=../redhat/kabi-dwarf 
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 
+KEXTRAVERSION= 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
+MARKER=v5.16 
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+PKGRELEASE=6.test 
+PREBUILD= 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.0-6.test.tar.xz 
+TARFILE=linux-5.16.0-6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=centos 
+DISTRO_BUILD=6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+HEAD=df0cc57e057f 
+INCLUDE_FEDORA_FILES=1 
+INCLUDE_RHEL_FILES=1 
+KABIDW=../redhat/kabi-dwarf 
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 
+KEXTRAVERSION= 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=v5.16 
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+PKGRELEASE=6.test 
+PREBUILD= 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.0-6.test.tar.xz 
+TARFILE=linux-5.16.0-6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=centos 
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+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.fce15c45d3fb.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+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=fce15c45d3fb 
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
+PREBUILD=0.rc5.fce15c45d3fb. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
+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.fce15c45d3fb.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -0,0 +1,102 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUILD_PROFILE=-p stream 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=centos 
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+GL_FORK_PATH=kernel.git 
+GNUMAKEFLAGS= 
+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.fce15c45d3fb.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+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=fce15c45d3fb 
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
+PREBUILD=0.rc5.fce15c45d3fb. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT=[e-mail]:/kernel.git 
+RHDISTGIT_BRANCH=c9s 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=centpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=1 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
+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.fce15c45d3fb.6.test.tar.xz 
+TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz 
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/create-data.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/bash
+
+target_dir=$1
+[ -z "${target_dir}" ] && echo "Missing target directory."
&& 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.
+#
+# The ark commit IDs are
+#
+#    78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
+#    2585cf9dfaad := 5.16-rc5
+#    df0cc57e057f := 5.16
+#    fce15c45d3fb := 5.16-rc5 + 2 additional commits
+#
+
+[ -z "$REDHAT" ] && echo "ERROR: execution only supported through
'make dist-self-test-data'" && exit 1
+
+for DISTRO in fedora rhel centos
+do
+	for commit in 78e36f3b0dae 2585cf9dfaad df0cc57e057f fce15c45d3fb
+	do
+		for DIST in .fc25 .el7
+		do
+			varfilename="${DISTRO}-${commit}${DIST}"
+
+			echo "building $varfilename"
+
+			# CURDIR is a make special target and cannot be easily changed.  Omit
+			# CURDIR from the output.
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${target_dir}"/"${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 echo
"$VAR=${!VAR}"; done >>
"${target_dir}"/"${varfilename}"
+		done
+	done
+done
+
+exit 0
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc5.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+GNUMAKEFLAGS= 
+HEAD=2585cf9dfaad 
+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.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 
+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
+MARKER=v5.16-rc5 
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+PKGRELEASE=0.rc5.6.test 
+PREBUILD=0.rc5. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16-rc5.tar.xz 
+TARFILE=linux-5.16-rc5.tar.xz 
+TARFILE_RELEASE=5.16-rc5 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc5.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+GNUMAKEFLAGS= 
+HEAD=2585cf9dfaad 
+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.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 
+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=v5.16-rc5 
+MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
+PKGRELEASE=0.rc5.6.test 
+PREBUILD=0.rc5. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16-rc5.tar.xz 
+TARFILE=linux-5.16-rc5.tar.xz 
+TARFILE_RELEASE=5.16-rc5 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+GNUMAKEFLAGS= 
+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.78e36f3b0dae.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

+KEXTRAVERSION=.rc0 
+KVERSION=5.17.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
+MARKER=78e36f3b0dae 
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
+PREBUILD=0.rc0.78e36f3b0dae. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=17 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz 
+TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-11523-g78e36f3b0dae 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+GNUMAKEFLAGS= 
+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.78e36f3b0dae.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

+KEXTRAVERSION=.rc0 
+KVERSION=5.17.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=78e36f3b0dae 
+MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
+PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
+PREBUILD=0.rc0.78e36f3b0dae. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=17 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz 
+TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-11523-g78e36f3b0dae 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=fedora 
+DISTRO_BUILD=6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+GNUMAKEFLAGS= 
+HEAD=df0cc57e057f 
+INCLUDE_FEDORA_FILES=1 
+INCLUDE_RHEL_FILES=1 
+KABIDW=../redhat/kabi-dwarf 
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 
+KEXTRAVERSION= 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
+MARKER=v5.16 
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+PKGRELEASE=6.test 
+PREBUILD= 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.tar.xz 
+TARFILE=linux-5.16.tar.xz 
+TARFILE_RELEASE=5.16 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=fedora 
+DISTRO_BUILD=6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+GNUMAKEFLAGS= 
+HEAD=df0cc57e057f 
+INCLUDE_FEDORA_FILES=1 
+INCLUDE_RHEL_FILES=1 
+KABIDW=../redhat/kabi-dwarf 
+KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 
+KEXTRAVERSION= 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=v5.16 
+MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
+PKGRELEASE=6.test 
+PREBUILD= 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION= 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=0 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm 
+SRPMS=../redhat/rpm/SRPMS 
+TARBALL=../redhat/linux-5.16.tar.xz 
+TARFILE=linux-5.16.tar.xz 
+TARFILE_RELEASE=5.16 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .el7" 
+CURARCH=x86_64 
+DIST=.el7 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+GNUMAKEFLAGS= 
+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.fce15c45d3fb.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
+MARKER=fce15c45d3fb 
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
+PREBUILD=0.rc5.fce15c45d3fb. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
+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-rc5-1-gfce15c45d3fb.tar.xz 
+TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz 
+TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -0,0 +1,100 @@
+.DEFAULT_GOAL=dist-cross-download 
+.SHELLSTATUS=0 
+ARCHCONFIG=X86_64 
+ARCH_LIST=aarch64 ppc64le s390x x86_64 
+BUILD_FLAGS= 
+BUMP_RELEASE=yes 
+CHANGELOG=kernel.changelog-9.99 
+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 
+CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define
"_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir
../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define
"_specdir ../redhat/rpm/SPECS" --define "dist .fc25" 
+CURARCH=x86_64 
+DIST=.fc25 
+DISTRO=fedora 
+DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+EARLY_YBUILD= 
+EARLY_YRELEASE= 
+FLAVOR= 
+GITID=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+GNUMAKEFLAGS= 
+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.fce15c45d3fb.6.tar.bz2 
+KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

+KEXTRAVERSION=.rc5 
+KVERSION=5.16.0 
+LANG=C 
+LOCVERFILE=../localversion 
+MACH=x86_64 
+MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
+MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
+MARKER=fce15c45d3fb 
+MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
+PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
+PREBUILD=0.rc5.fce15c45d3fb. 
+PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
+PROCESS_CONFIGS_OPTS=-n -w -c 
+REDHAT=../redhat 
+RELEASED_KERNEL=0 
+RHDISTGIT="ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel" 
+RHDISTGIT_BRANCH=rawhide 
+RHDISTGIT_TMP=/tmp 
+RHDISTGIT_USER="shadowman" 
+RHEL_MAJOR=9 
+RHEL_MINOR=99 
+RHEL_RELEASE=6 
+RHPKG_BIN=fedpkg 
+RHSELFTESTDATA=1 
+RPM=../redhat/rpm 
+RPMBUILD=rpmbuild 
+RPMKEXTRAVERSION=-rc5 
+RPMKPATCHLEVEL=16 
+RPMKSUBLEVEL=0 
+RPMKVERSION=5 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+SHELL=/bin/sh 
+SINGLE_TARBALL=0 
+SNAPSHOT=1 
+SOURCES=../redhat/rpm/SOURCES 
+SPECFILE=kernel.spec 
+SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
+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-rc5-1-gfce15c45d3fb.tar.xz 
+TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz 
+TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
+TESTPATCH=../redhat/linux-kernel-test.patch 
+TOPDIR=.. 
+UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+VERSION_ON_UPSTREAM=1 
+_OUTPUT=.. 
+_TAG=v5.16-rc5-1-gfce15c45d3fb 
+__YSTREAM=yes 
+__ZSTREAM=no 
+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
+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=
+BUILD=6
+PREBUILD_GIT_ONLY=1
+RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITCOMMIT=HEAD
+RHJOBS=1
+NO_CONFIGCHECKS=
+RHSELFTESTDATA=

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

[OS-BUILD PATCHv5 2/8] redhat/self-test: Add better dist-dump-variables test

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: Add better dist-dump-variables test

The current dist-dump-variables test is not adequate in that it only tests
a small number of fields.  Add a test to run create-data.sh and compare
that data against the stored "known good" output in self-test/data.

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
@@ -29,6 +29,10 @@ endif
 REDHAT:=$(TOPDIR)/redhat
 include $(TOPDIR)/Makefile.rhelver
 
+ifndef RHDISTDATADIR
+  RHDISTDATADIR=${REDHAT}/self-test/data
+endif
+
 RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
                   else echo rpm; fi)
 
@@ -655,7 +659,7 @@ dist-self-test:
 	fi
 
 dist-self-test-data:
-	./self-test/data/create-data.sh ${REDHAT}/self-test/data
+	./self-test/data/create-data.sh
 
 dist-help:
 	@echo  'Cleaning targets:'
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -123,3 +123,7 @@ NO_CONFIGCHECKS ?=
 # This variable is only used to create self-test data.  It should not be
 # considered stable and may be changed or removed without warning.
 RHSELFTESTDATA ?=
+
+# This variable is used by the redhat/self-tests.  It should not be
+# considered stable and my be changed or removed without warning.
+RHDISTDATADIR ?=
diff --git a/redhat/self-test/1005-dist-dump-variables.bats
b/redhat/self-test/1005-dist-dump-variables.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/1005-dist-dump-variables.bats
+++ b/redhat/self-test/1005-dist-dump-variables.bats
@@ -1,57 +1,12 @@
 #!/usr/bin/env bats
 
-function prologue()
-{
-    tag=$1
-    ofile=$BATS_TMPDIR/$tag.out
-    # Have to unset environment variables that may be inherited from supra-make:
-    make dist-dump-variables | grep "=" | cut -d"=" -f1 | while read
VAR; do unset "$VAR"; done
-    GIT=$BATS_TEST_DIRNAME/egit.sh HEAD=$tag EGIT_OVERRIDE_DESCRIBE=$tag DIST=.fc33 make
dist-dump-variables > $ofile
-}
-
-function checkversion()
-{
-	echo "verifying _TAG=$1"
-	grep -E "^_TAG=$1" $ofile
-	echo "verifying RPMKVERSION=$2"
-	grep -E "^RPMKVERSION=$2" $ofile
-	echo "verifying RPMPATCHLEVEL=$3"
-	grep -E "^RPMKPATCHLEVEL=$3" $ofile
-	echo "verifying RPMSUBLEVEL=$4"
-	grep -E "^RPMKSUBLEVEL=$4" $ofile
-	echo "verifying RPMEXTRAVERSION=$5"
-	grep -E "^RPMKEXTRAVERSION=$5" $ofile
-	echo "verifying KEXTRAVERSION=$6"
-	grep -E "^KEXTRAVERSION=$6" $ofile
-	echo "verifying SNAPSHOT=$6"
-	grep -E "^SNAPSHOT=$7" $ofile
-	status=0
-}
-
-@test "dist-dump-variables v5.8" {
-    tag=v5.8
-    prologue $tag
-    checkversion $tag "5" "8" "0" "" ""
"0"
-    [ "$status" = 0 ]
-}
-
-@test "dist-dump-variables v5.8-rc7" {
-    tag=v5.8-rc7
-    prologue $tag
-    checkversion $tag "5" "8" "0" "-rc7"
".rc7" "0"
-    [ "$status" = 0 ]
-}
+@test "self-test-data check" {
+	mkdir -p $BATS_TMPDIR/data
+	RHDISTDATADIR=$BATS_TMPDIR/data make dist-self-test-data
 
-@test "dist-dump-variables v5.8-9-g565674d613d7" {
-    tag=v5.8-9-g565674d613d7
-    prologue $tag
-    checkversion $tag "5" "9" "0" ""
".rc0" "1"
-    [ "$status" = 0 ]
-}
+	redhat=$(make dist-dump-variables | grep "REDHAT=" | cut -d"=" -f2 |
xargs)
 
-@test "dist-dump-variables v5.8-rc5-99-g25ccd24ffd91" {
-    tag=v5.8-rc5-99-g25ccd24ffd91
-    prologue $tag
-    checkversion $tag "5" "8" "0" "-rc5"
".rc5" "1"
-    [ "$status" = 0 ]
+	echo "Diffing directories ${redhat}/self-test/data and $BATS_TMPDIR/data"
+	diff -urNp -x create-data.sh ${redhat}/self-test/data $BATS_TMPDIR/data
+	[ -d $BATS_TMPDIR ] && rm -rf $BATS_TMPDIR/data
 }
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -69,7 +69,7 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
 TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -95,7 +95,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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,6 @@
 #!/usr/bin/bash
 
-target_dir=$1
-[ -z "${target_dir}" ] && echo "Missing target directory."
&& exit 1
+[ -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
@@ -15,21 +14,19 @@ target_dir=$1
 #    fce15c45d3fb := 5.16-rc5 + 2 additional commits
 #
 
-[ -z "$REDHAT" ] && echo "ERROR: execution only supported through
'make dist-self-test-data'" && exit 1
-
 for DISTRO in fedora rhel centos
 do
 	for commit in 78e36f3b0dae 2585cf9dfaad df0cc57e057f fce15c45d3fb
 	do
 		for DIST in .fc25 .el7
 		do
-			varfilename="${DISTRO}-${commit}${DIST}"
+			varfilename="${RHDISTDATADIR}/${DISTRO}-${commit}${DIST}"
 
 			echo "building $varfilename"
 
 			# CURDIR is a make special target and cannot be easily changed.  Omit
 			# CURDIR from the output.
-			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${target_dir}"/"${varfilename}"
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${varfilename}"
 
 			# When executed from a script, the variables in Makefile.variables are
 			# listed as having origin 'environment'.  This is because the script
@@ -38,7 +35,11 @@ do
 			# 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 echo
"$VAR=${!VAR}"; done >>
"${target_dir}"/"${varfilename}"
+			cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR
+			do
+				[ "$VAR" == "RHDISTDATADIR" ] && continue
+				echo "$VAR=${!VAR}"
+			done >> "${varfilename}"
 		done
 	done
 done
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
 TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz
 TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
 TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
 TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
 TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fb.tar.xz
 TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fb 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=aa5b537b0ecc16992577b013f11112d54c7ce869 
+UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -93,7 +93,7 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:cki-project/kernel-ark.git
+RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=

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

[OS-BUILD PATCHv5 3/8] redhat/self-test: Add spec file data

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: Add spec file data

Add spec file examples for various release types and modify create-data.sh
to create the data.  This data will be used as a baseline for testing of
Makefile changes.

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

diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
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
@@ -40,6 +40,10 @@ do
 				[ "$VAR" == "RHDISTDATADIR" ] && continue
 				echo "$VAR=${!VAR}"
 			done >> "${varfilename}"
+
+			echo "building ${varfilename}.spec"
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} setup-source
+			cp "${SOURCES}"/kernel.spec "${varfilename}".spec
 		done
 	done
 done
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
new file mode 100755
index blahblah..blahblah 100755
--- /dev/null
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec

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

[OS-BUILD PATCHv5 4/8] redhat/genspec.sh: Rearrange genspec.sh

[Prarit Bhargava (via Email Bridge)]

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

redhat/genspec.sh: Rearrange genspec.sh

genspec.sh takes a long time to run when executed to create test
examples.  The script does three things: creates a changelog, creates a
patch file, and creates the specfile.  Reorganize the code so that the
specfile is created first, and exit if the file is created for a test
examples.

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

diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -10,6 +10,82 @@ HIDE_UNSUPPORTED_ARCH=1;
 LC_TIME=
 # STAMP=$(echo $MARKER | cut -f 1 -d '-' | sed -e "s/v//"); # unused
 
+UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \
+	   git rev-parse -q --verify "${UPSTREAM_BRANCH}")
+
+if [ "$SNAPSHOT" = 0 ]; then
+	# This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5).
+	# Two kernels are built, one with debug configuration and one without.
+	DEBUG_BUILDS_ENABLED=1
+else
+	# All kernels are built with debug configurations.
+	DEBUG_BUILDS_ENABLED=0
+fi
+
+if [ -n "$BUILDID" ]; then
+	BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID")
+else
+	BUILDID_DEFINE="# define buildid .local"
+fi
+
+EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
+		:(exclude,top).gitattributes \
+		:(exclude,top).gitignore \
+		:(exclude,top).gitlab-ci.yml \
+		:(exclude,top)makefile \
+		:(exclude,top)Makefile.rhelver \
+		:(exclude,top)redhat \
+		:(exclude,top)configs"
+
+# If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file
that
+# holds the shas and commits not included upstream and git commit url.
+PATCHLIST_CHANGELOG=0
+if [ "$PATCHLIST_URL" != "none" ]; then
+	# sed convert
+	# <sha> <description>
+	# to
+	# <ark_commit_url>/<sha>
+	#  <sha> <description>
+	#
+	# May need to preserve word splitting in EXCLUDE_FILES
+	# shellcheck disable=SC2086
+	git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \
+		sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \
+		> "$SOURCES"/Patchlist.changelog
+	PATCHLIST_CHANGELOG=1
+fi
+
+test -f "$SOURCES/$SPECFILE" &&
+	sed -i -e "
+	/%%CHANGELOG%%/r $SOURCES/$CHANGELOG
+	/%%CHANGELOG%%/d
+	s/%%BUILDID%%/$BUILDID_DEFINE/
+	s/%%RPMKVERSION%%/$RPMKVERSION/
+	s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
+	s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/
+	s/%%PKGRELEASE%%/$PKGRELEASE/
+	s/%%SPECRELEASE%%/$SPECRELEASE/
+	s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
+	s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
+	s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
+	s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
+	s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
+	s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
+	s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
+
+# We depend on work splitting of BUILDOPTS
+# shellcheck disable=SC2086
+for opt in $BUILDOPTS; do
+	add_opt=
+	[ -z "${opt##+*}" ] && add_opt="_with_${opt#?}"
+	[ -z "${opt##-*}" ] && add_opt="_without_${opt#?}"
+	[ -n "$add_opt" ] && sed -i "s/^\\(# The following build
options\\)/%define $add_opt 1\\n\\1/" "$SOURCES/$SPECFILE"
+done
+
+# The self-test data doesn't currently have tests for the changelog or patch file, so
the
+# rest of the script can be ignored.
+[ -n "$RHSELFTESTDATA" ] && exit 0
+
 echo > "$clogf"
 
 lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${RPMKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD)
@@ -25,9 +101,7 @@ if [[ -z $lasttag ]]; then
 fi
 echo "Gathering new log entries since $lasttag"
 # master is expected to track mainline.
-UPSTREAM=$(git rev-parse -q --verify origin/"${UPSTREAM_BRANCH}" || \
-          git rev-parse -q --verify "${UPSTREAM_BRANCH}")
- 
+
 git log --topo-order --reverse --no-merges -z --format="- %s (%an)%n%b" \
 	^"${UPSTREAM}" "$lasttag".. -- ':!/redhat/rhdocs' |
"${0%/*}"/genlog.py >> "$clogf"
 
@@ -85,66 +159,6 @@ fi
 cat "$clogf.rev" "$SOURCES/$CHANGELOG" > "$clogf.full"
 mv -f "$clogf.full" "$SOURCES/$CHANGELOG"
 
-if [ "$SNAPSHOT" = 0 ]; then
-	# This is based off a tag on Linus's tree (e.g. v5.5 or v5.5-rc5).
-	# Two kernels are built, one with debug configuration and one without.
-	DEBUG_BUILDS_ENABLED=1
-else
-	# All kernels are built with debug configurations.
-	DEBUG_BUILDS_ENABLED=0
-fi
-
-if [ -n "$BUILDID" ]; then
-	BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID")
-else
-	BUILDID_DEFINE="# define buildid .local"
-fi
-
-EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \
-		:(exclude,top).gitattributes \
-		:(exclude,top).gitignore \
-		:(exclude,top).gitlab-ci.yml \
-		:(exclude,top)makefile \
-		:(exclude,top)Makefile.rhelver \
-		:(exclude,top)redhat \
-		:(exclude,top)configs"
-
-# If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file
that
-# holds the shas and commits not included upstream and git commit url.
-PATCHLIST_CHANGELOG=0
-if [ "$PATCHLIST_URL" != "none" ]; then
-	# sed convert
-	# <sha> <description>
-	# to
-	# <ark_commit_url>/<sha>
-	#  <sha> <description>
-	#
-	# May need to preserve word splitting in EXCLUDE_FILES
-	# shellcheck disable=SC2086
-	git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \
-		sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \
-		> "$SOURCES"/Patchlist.changelog
-	PATCHLIST_CHANGELOG=1
-fi
-
-test -f "$SOURCES/$SPECFILE" &&
-	sed -i -e "
-	/%%CHANGELOG%%/r $SOURCES/$CHANGELOG
-	/%%CHANGELOG%%/d
-	s/%%BUILDID%%/$BUILDID_DEFINE/
-	s/%%RPMKVERSION%%/$RPMKVERSION/
-	s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
-	s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/
-	s/%%PKGRELEASE%%/$PKGRELEASE/
-	s/%%SPECRELEASE%%/$SPECRELEASE/
-	s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
-	s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
-	s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
-	s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
-	s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
-	s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
-	s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
-
 echo "MARKER is $MARKER"
 
 if [ "$SINGLE_TARBALL" = 0 ]; then
@@ -157,13 +171,4 @@ else
 	touch "${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
 fi
 
-# We depend on work splitting of BUILDOPTS
-# shellcheck disable=SC2086
-for opt in $BUILDOPTS; do
-	add_opt=
-	[ -z "${opt##+*}" ] && add_opt="_with_${opt#?}"
-	[ -z "${opt##-*}" ] && add_opt="_without_${opt#?}"
-	[ -n "$add_opt" ] && sed -i "s/^\\(# The following build
options\\)/%define $add_opt 1\\n\\1/" "$SOURCES/$SPECFILE"
-done
-
 rm -f "$clogf"{,.rev,.stripped};
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
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
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-6.test]
-- v5.16 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
-- fce15c45d3fb rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt; [5.16.0-0.rc5.6.test]
-- v5.16-rc5 rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -3022,18 +3022,6 @@ fi
 #
 #
 %changelog
-* Tue Mar 29 2022 Prarit Bhargava <prarit(a)redhat.com&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
-- 78e36f3b0dae rebase
-- redhat/self-test: Add spec file data (Prarit Bhargava)
-- redhat/self-test: Add better dist-dump-variables test (Prarit Bhargava)
-- redhat/self-test: Add variable test data (Prarit Bhargava)
-- Fedora config updates to fix process_configs (Justin M. Forbes)
-- redhat: Fix release tagging (Prarit Bhargava)
-- redhat/self-test: Fix version tag test (Prarit Bhargava)
-- redhat/self-test: Fix BUILD verification test (Prarit Bhargava)
-- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava)
-- redhat/self-test: Fix shellcheck test (Prarit Bhargava)
-
 * Fri Mar 25 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.18-0.rc0.34af78c4e616.5]
 - redhat/configs: Disable watchdog components (Prarit Bhargava)
 - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava)

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

[OS-BUILD PATCHv5 5/8] redhat/self-test: Remove changelog from spec files

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-test: Remove changelog from spec files

Remove the changelog entries from spec files and replace it with a generic
one line entry.  We currently do not have changelog tests, and removing
them at this time will make testing easier.

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
@@ -453,7 +453,11 @@ setup-source: dist-git-version-check dist-clean-sources
 		echo "Creating $(CHANGELOG) as copy of $(CHANGELOG_PREV)"; \
 		cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(CHANGELOG); \
 	fi
-	@cp $(REDHAT)/$(CHANGELOG) $(SOURCES)/$(CHANGELOG)
+	@if [ -z "$(RHSELFTESTDATA)" ]; then \
+		cp $(REDHAT)/$(CHANGELOG) $(SOURCES)/$(CHANGELOG); \
+	else \
+		echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[$(RPMVERSION)]" > $(SOURCES)/$(CHANGELOG); \
+	fi
 	@if [ -z "$(PATCHLIST_URL)" ]; then \
 		echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; \
 		exit 1; \
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -83,7 +83,8 @@ for opt in $BUILDOPTS; do
 done
 
 # The self-test data doesn't currently have tests for the changelog or patch file, so
the
-# rest of the script can be ignored.
+# rest of the script can be ignored.  See redhat/Makefile setup-source target for
related
+# test changes.
 [ -n "$RHSELFTESTDATA" ] && exit 0
 
 echo > "$clogf"
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
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
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
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
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
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
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
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
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
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
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec

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

[OS-BUILD PATCHv5 6/8] redhat/Makefile.variables: Extend git hash length to 15

[Prarit Bhargava (via Email Bridge)]

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

redhat/Makefile.variables: Extend git hash length to 15

While testing the dist-self-test-data target, dzickus noticed that the git
hash lengths were 13 and not 12 on his output.  After discussion, and to
avoid future problems, we have decided to default the hash length to 15.

Extend the git hash length to 15.

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

diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -70,7 +70,7 @@ PACKAGE_NAME ?= kernel
 
 # This is the executable for 'git' commands.  It is used by the redhat/self-test
 # tests to provide testing information on git hashes (see redhat/self-test/egit.sh)
-GIT ?= git
+GIT ?= git -c "core.abbrev=15"
 
 # This is the referenced HEAD commit for git commands and can be used to change
 # the "top of tree" commit ID.  This is useful in cases where users want to
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -23,8 +23,8 @@ 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.78e36f3b0dae.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

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

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

 KEXTRAVERSION=.rc0 
 KVERSION=5.17.0 
 LANG=C 
@@ -32,10 +32,10 @@ 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=78e36f3b0dae 
+MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
-PREBUILD=0.rc0.78e36f3b0dae. 
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
+PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=
 RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm 
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-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 
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
+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 
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+_TAG=v5.16-11523-g78e36f3b0dae586 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.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.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
+mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.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
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -23,8 +23,8 @@ 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.78e36f3b0dae.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

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

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

 KEXTRAVERSION=.rc0 
 KVERSION=5.17.0 
 LANG=C 
@@ -32,10 +32,10 @@ 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=78e36f3b0dae 
+MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
-PREBUILD=0.rc0.78e36f3b0dae. 
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
+PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=
 RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm 
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-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 
-TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test 
+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 
+TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+_TAG=v5.16-11523-g78e36f3b0dae586 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.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.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz
+Source0: linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae.6.test -c
-mv linux-5.17.0-0.rc0.78e36f3b0dae.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test -c
+mv linux-5.17.0-0.rc0.78e36f3b0dae586.6.test linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.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
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -69,7 +69,7 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=centos 
-DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -23,8 +23,8 @@ 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.fce15c45d3fb.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

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

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

 KEXTRAVERSION=.rc5 
 KVERSION=5.16.0 
 LANG=C 
@@ -32,10 +32,10 @@ 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=fce15c45d3fb 
+MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
-PREBUILD=0.rc5.fce15c45d3fb. 
+PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
+PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=-rc5
 RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.src.rpm 
+SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-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 
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
+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 
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+_TAG=v5.16-rc5-1-gfce15c45d3fbd9f 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc5.fce15c45d3fb.6
+%global distro_build 0.rc5.fce15c45d3fbd9f.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.fce15c45d3fbd9f.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.fce15c45d3fb.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fb.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fb.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
+mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fbd9f.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
@@ -12,7 +12,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=centos 
-DISTRO_BUILD=0.rc5.fce15c45d3fb.6 
+DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -23,8 +23,8 @@ 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.fce15c45d3fb.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.tar.bz2

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

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

 KEXTRAVERSION=.rc5 
 KVERSION=5.16.0 
 LANG=C 
@@ -32,10 +32,10 @@ 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=fce15c45d3fb 
+MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fb.6.test 
-PREBUILD=0.rc5.fce15c45d3fb. 
+PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
+PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -55,25 +55,25 @@ RPMKEXTRAVERSION=-rc5
 RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test 
+RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.src.rpm 
+SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-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 
-TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test 
+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 
+TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-rc5-1-gfce15c45d3fb 
+_TAG=v5.16-rc5-1-gfce15c45d3fbd9f 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -87,7 +87,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc5.fce15c45d3fb.6
+%global distro_build 0.rc5.fce15c45d3fbd9f.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc5.fce15c45d3fb.6.test
+%define pkgrelease 0.rc5.fce15c45d3fbd9f.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.fce15c45d3fb.6%{?buildid}%{?dist}
+%define specrelease 0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.xz
+Source0: linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fb.6.test -c
-mv linux-5.16.0-0.rc5.fce15c45d3fb.6.test linux-%{KVERREL}
+%setup -q -n kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test -c
+mv linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fb.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.16.0-0.rc5.fce15c45d3fbd9f.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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -67,7 +67,7 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
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
@@ -11,7 +11,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.el7 
 DISTRO=fedora 
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -21,8 +21,8 @@ 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.78e36f3b0dae.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

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

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

 KEXTRAVERSION=.rc0 
 KVERSION=5.17.0 
 LANG=C 
@@ -30,10 +30,10 @@ LOCVERFILE=../localversion
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
+MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
-PREBUILD=0.rc0.78e36f3b0dae. 
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
+PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -53,25 +53,25 @@ RPMKEXTRAVERSION=
 RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.src.rpm 
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz 
+TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz 
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+_TAG=v5.16-11523-g78e36f3b0dae586 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.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.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae.tar.xz
+Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae -c
-mv linux-5.16-11523-g78e36f3b0dae linux-%{KVERREL}
+%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
+mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -11,7 +11,7 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir
../redhat/rpm/SOURCES" --define "_b
 CURARCH=x86_64 
 DIST=.fc25 
 DISTRO=fedora 
-DISTRO_BUILD=0.rc0.78e36f3b0dae.6 
+DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 
 EARLY_YBUILD= 
 EARLY_YRELEASE= 
 FLAVOR= 
@@ -21,8 +21,8 @@ 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.78e36f3b0dae.6.tar.bz2 
-KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.tar.bz2

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

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

 KEXTRAVERSION=.rc0 
 KVERSION=5.17.0 
 LANG=C 
@@ -30,10 +30,10 @@ LOCVERFILE=../localversion
 MACH=x86_64 
 MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver Makefile.rhpkg
Makefile.cross 
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
-MARKER=78e36f3b0dae 
+MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae.6.test 
-PREBUILD=0.rc0.78e36f3b0dae. 
+PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
+PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
@@ -53,25 +53,25 @@ RPMKEXTRAVERSION=
 RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMKVERSION=5 
-RPMVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test 
+RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
-SPECRELEASE=0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} 
-SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.src.rpm 
+SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
+SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 
 SRPMS=../redhat/rpm/SRPMS 
-TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE=linux-5.16-11523-g78e36f3b0dae.tar.xz 
-TARFILE_RELEASE=5.16-11523-g78e36f3b0dae 
+TARBALL=../redhat/linux-5.16-11523-g78e36f3b0dae586.tar.xz 
+TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz 
+TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
-UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
+UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
-_TAG=v5.16-11523-g78e36f3b0dae 
+_TAG=v5.16-11523-g78e36f3b0dae586 
 __YSTREAM=yes 
 __ZSTREAM=no 
 DIST_BRANCH="os-build"
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc0.78e36f3b0dae.6
+%global distro_build 0.rc0.78e36f3b0dae586.6
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc0.78e36f3b0dae.6.test
+%define pkgrelease 0.rc0.78e36f3b0dae586.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.78e36f3b0dae.6%{?buildid}%{?dist}
+%define specrelease 0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -698,7 +698,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-11523-g78e36f3b0dae.tar.xz
+Source0: linux-5.16-11523-g78e36f3b0dae586.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1394,8 +1394,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-11523-g78e36f3b0dae -c
-mv linux-5.16-11523-g78e36f3b0dae linux-%{KVERREL}
+%setup -q -n kernel-5.16-11523-g78e36f3b0dae586 -c
+mv linux-5.16-11523-g78e36f3b0dae586 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -3022,7 +3022,7 @@ fi
 #
 #
 %changelog
-Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae.6.test]
+Mon Mar 28 2022 Fedora Kernel Team <kernel-team(a)fedoraproject.org&gt;
[5.17.0-0.rc0.78e36f3b0dae586.6.test]
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
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
@@ -67,7 +67,7 @@ TARFILE=linux-5.16.tar.xz
 TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=1930a6e739c4b4a654a69164dbe39e554d228915 
+UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
@@ -85,7 +85,7 @@ INCLUDE_FEDORA_FILES=1
 INCLUDE_RHEL_FILES=1
 PATCHLIST_URL="https://gitlab.com/cki-project/kernel-ark/-/commit"
 PACKAGE_NAME=kernel
-GIT=git
+GIT=git -c "core.abbrev=15"
 HEAD=HEAD
 BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
 BUILD_TARGET=--scratch temp-ark-rhel-8-test

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

[OS-BUILD PATCHv5 7/8] redhat/self-tests: Ignore RHGITURL

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-tests: Ignore RHGITURL

While testing, dzickus noticed that his RHGITURL was different from the
RHGITURL in the default data.  This is because RHGITURL is dependent on
the user's local git configuration and therefore cannot be guaranteed to
be unique across all users.

Ignore RHGITURL from the data set.

Reported-by: Don Zickus <dzickus(a)redhat.com&gt;
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -95,7 +95,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -38,6 +38,7 @@ do
 			cat Makefile.variables | grep -v "^#" | sed '/^$/d' | tr -d "
" | awk -F "?=|:=" '{print $1}' | while read -r VAR
 			do
 				[ "$VAR" == "RHDISTDATADIR" ] && continue
+				[ "$VAR" == "RHGITURL" ] && continue
 				echo "$VAR=${!VAR}"
 			done >> "${varfilename}"
 
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=
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
@@ -93,7 +93,6 @@ BUILD_PROFILE=
 BUILD_FLAGS=
 BUILD=6
 PREBUILD_GIT_ONLY=1
-RHGITURL=[e-mail]:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=

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

[OS-BUILD PATCHv5 8/8] redhat/self-tests: Ignore UPSTREAM

[Prarit Bhargava (via Email Bridge)]

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

redhat/self-tests: Ignore UPSTREAM

While testing, dzickus noticed that his UPSTREAM was different from the
UPSTREAM in the default data.  This is because UPSTREAM is the base
merge commit and will change as the repository is updated.

Ignore UPSTREAM from the data set.

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

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
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -69,7 +69,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
 TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -69,7 +69,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
 TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-6.test.tar.xz
 TARFILE_RELEASE=5.16.0-6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -69,7 +69,6 @@ TARFILE=linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -26,7 +26,9 @@ do
 
 			# CURDIR is a make special target and cannot be easily changed.  Omit
 			# CURDIR from the output.
-			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR >&
"${varfilename}"
+			# UPSTREAM is the base merge commit and can change from day-to-day as
+			# the tree is changed.  Omit UPSTREAM from the output.
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM >& "${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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5.tar.xz
 TARFILE_RELEASE=5.16-rc5 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
 TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-11523-g78e36f3b0dae586.tar.xz
 TARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.tar.xz
 TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.tar.xz
 TARFILE_RELEASE=5.16 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
 TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16-rc5-1-gfce15c45d3fbd9f.tar.xz
 TARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fbd9f 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.16.0-0.rc5.6.test.tar.xz
 TARFILE_RELEASE=5.16.0-0.rc5.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-rc5 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 
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
@@ -67,7 +67,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
 TARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 TESTPATCH=../redhat/linux-kernel-test.patch 
 TOPDIR=.. 
-UPSTREAM=ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 
 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae586 
 VERSION_ON_UPSTREAM=1 
 _OUTPUT=.. 

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

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706#note_8936...

Oops.  Bad typo.  Fixed.

[Don Zickus (via Email Bridge)]

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

@jmflinuxtx - do you want a linux-stable version number in the self-tests too?
Or is that covered by the 'official' example and never breaks?

[Don Zickus (via Email Bridge)]

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

block

[Don Zickus (via Email Bridge)]

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

we can add it later.