From 664050adcef10ce89dbb454e5dd29b8a0f6675d3 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jan 21 2018 23:58:51 +0000
Subject: no sudo needed for writing to /etc/salt/grains


---

diff --git a/bin/prepare_test_highstate_env.sh b/bin/prepare_test_highstate_env.sh
index 163b563..022ca5b 100755
--- a/bin/prepare_test_highstate_env.sh
+++ b/bin/prepare_test_highstate_env.sh
@@ -40,6 +40,6 @@ $SUDO ln -s $PWD/salt /srv/salt
 $SUDO ln -s $PWD/pillar /srv/pillar
 ID=$(hostname -f)
 ROLES=$(bin/get_roles.py -o yaml)
-printf "city:\ncountry:\ndomain: infra.opensuse.org\nosfullname:\nosmajorrelease:\nosrelease_info:\n$ROLES\nsalt_cluster: opensuse\nvirt_cluster:\n" | $SUDO tee /etc/salt/grains > /dev/null
+printf "city:\ncountry:\ndomain: infra.opensuse.org\nosfullname:\nosmajorrelease:\nosrelease_info:\n$ROLES\nsalt_cluster: opensuse\nvirt_cluster:\n" > /etc/salt/grains
 printf "grains:\n  city: nuremberg\n  country: de\n  hostusage: test\n  salt_cluster: opensuse\n  virt_cluster: atreju\n" > pillar/id/${ID//./_}.sls
 [[ -n $STRIP_SECRETS ]] && sed -i -e "s#\- secrets\..*#- id.${ID//./_}#g" $(grep -lr "\- secrets\." pillar)
diff --git a/bin/run_tests_locally.sh b/bin/run_tests_locally.sh
index 93366a0..76eebd9 100755
--- a/bin/run_tests_locally.sh
+++ b/bin/run_tests_locally.sh
@@ -30,12 +30,12 @@ SALT_DIRS=(
 )
 
 # Prepare env
-bin/prepare_test_highstate_env.sh
 bin/get_formulas.py --destination $DESTINATION --clone --symlink --use-pygit2 --update opensuse \
     --add-remote opensuse no_prefix gitlab@gitlab.infra.opensuse.org: saltstack-formulas
 for dir in ${SALT_DIRS[@]}; do
     sudo chown -R ${USER}: $dir
 done
+bin/prepare_test_highstate_env.sh
 echo "virtual: kvm" >> /etc/salt/grains
 ln -s ~/.gnupg /etc/salt/gpgkeys