From: Prarit Bhargava <[email protected]> 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 <[email protected]> Signed-off-by: Prarit Bhargava <[email protected]> Signed-off-by: Prarit Bhargava <[email protected]> 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 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] 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/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
