From fa63bb91f066c4a79e1b68fe67ca3afad3681e35 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 10 2020 15:24:58 +0000
Subject: Merge branch 'cboltz-pipeline' into 'production'


fix pipeline with "old" test scripts

See merge request infra/salt!363
---

diff --git a/bin/prepare_test_env.sh b/bin/prepare_test_env.sh
index 605d199..41f17f1 100755
--- a/bin/prepare_test_env.sh
+++ b/bin/prepare_test_env.sh
@@ -29,8 +29,10 @@ help() {
 [[ $1 == '--help' ]] && help && exit
 
 #source /etc/os-release
+source /etc/os-release
 SECRETS="False"
 #REPO_URL=${PRETTY_NAME// /_}
+REPO_URL=${PRETTY_NAME// /_}
 
 while getopts p:i:o:gsh arg; do
     case ${arg} in
@@ -52,6 +54,7 @@ if [[ $INSTANCE == 'opensuse' ]]; then
     SALT_CLUSTER='opensuse'
     VIRT_CLUSTER='atreju'
     #$SUDO zypper -q ar -p 100 -fG http://download.opensuse.org/repositories/openSUSE:/infrastructure/${REPO_URL}/ openSUSE:infrastructure > /dev/null 2>&1
+    $SUDO zypper -q ar -p 100 -fG http://download.opensuse.org/repositories/openSUSE:/infrastructure/${REPO_URL}/ openSUSE:infrastructure > /dev/null 2>&1
     CERT_PKG='ca-certificates-freeipa-opensuse'
 elif [[ $INSTANCE == 'suse' ]]; then
     DOMAIN='suse.de'
@@ -62,6 +65,7 @@ elif [[ $INSTANCE == 'suse' ]]; then
 fi
 
 #$SUDO zypper -qn in --no-recommends salt python3-pygit2 $CERT_PKG ${HIGHSTATE_PKGS[@]} ${PKG[@]}
+$SUDO zypper -qn in --no-recommends salt python3-pygit2 $CERT_PKG ${HIGHSTATE_PKGS[@]} ${PKG[@]}
 $SUDO rm -rf /srv/{salt,pillar}
 $SUDO ln -s $PWD/salt /srv/salt
 $SUDO ln -s $PWD/pillar /srv/pillar
diff --git a/pillar/osfullname/CentOS_Linux.sls b/pillar/osfullname/CentOS_Linux.sls
index e69de29..792d600 100644
--- a/pillar/osfullname/CentOS_Linux.sls
+++ b/pillar/osfullname/CentOS_Linux.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/osmajorrelease/8.sls b/pillar/osmajorrelease/8.sls
index e69de29..792d600 100644
--- a/pillar/osmajorrelease/8.sls
+++ b/pillar/osmajorrelease/8.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls b/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls
index e69de29..792d600 100644
--- a/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls
+++ b/pillar/salt_cluster/opensuse/osfullname/CentOS_Linux.sls
@@ -0,0 +1 @@
+#