From: Patrick Talbert <ptalbert@xxxxxxxxxx> Revert "Merge branch 'fix-ci-20220523' into 'os-build'" This reverts merge request !1790 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 @@ -92,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 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 @@ -92,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 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.78e36f3b0dae.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 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.78e36f3b0dae.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 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 @@ -92,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 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 @@ -92,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 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.fce15c45d3fb.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc5.fce15c45d3fb. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 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.fce15c45d3fb.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc5.fce15c45d3fb. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -93,7 +92,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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-g78e36f3b0dae.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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-g78e36f3b0dae.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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-gfce15c45d3fb.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc5.fce15c45d3fb. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/fedora-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-gfce15c45d3fb.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc5.fce15c45d3fb. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-rc5-1-gfce15c45d3fb VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/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 @@ -90,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/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.78e36f3b0dae.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 b/redhat/self-test/data/rhel-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25 @@ -67,7 +67,6 @@ TARFILE=linux-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.xz TESTPATCH=../redhat/linux-kernel-test.patch TOPDIR=.. UPSTREAMBUILD=0.rc0.78e36f3b0dae. -UPSTREAMBUILD_GIT_ONLY=1 UPSTREAM_TARBALL_NAME=5.16-11523-g78e36f3b0dae VERSION_ON_UPSTREAM=1 YSTREAM_FLAG=yes @@ -91,7 +90,7 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test BUILD_TARGET=--scratch temp-ark-rhel-8-test BUILD_PROFILE= BUILD_FLAGS= -UPSTREAMBUILD_GIT_ONLY= +UPSTREAMBUILD_GIT_ONLY=1 RHGITCOMMIT=HEAD RHJOBS=1 NO_CONFIGCHECKS= -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1798 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure