[OS-BUILD PATCHv6 7/16] redhat/self-tests: Ignore RHGITURL

Thursday, 31 March 2022

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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com: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=git@gitlab.com:prarit/kernel-ark.git
 RHGITCOMMIT=HEAD
 RHJOBS=1
 NO_CONFIGCHECKS=

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

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[OS-BUILD PATCHv6 7/16] redhat/self-tests: Ignore RHGITURL