From: Boris Ranto <branto@redhat.com>
Date: Thu, 18 Aug 2016 12:12:42 +0000 (+0200)
Subject: calamari-server-trusty: fix environmental issues
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F434%2Fhead;p=ceph-build.git

calamari-server-trusty: fix environmental issues

The sudo command resets the enviroment by default so we never passed the
WORKSPACE variable to salt. This made salt default to HOME instead.

Also, we store the packages in pkgs/ subdir of WORKSPACE dir, fixing
that as well.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/calamari-server-trusty/build/build b/calamari-server-trusty/build/build
index 6804c664..d1ca2ef5 100644
--- a/calamari-server-trusty/build/build
+++ b/calamari-server-trusty/build/build
@@ -10,8 +10,7 @@ wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
 ssh-keyscan $(hostname -f)| sudo tee -a /root/.ssh/known_hosts
 sudo apt-get -y install salt-minion salt-common python-jinja2 multitee
 
-sudo salt-call --local --file-root=$(pwd)/vagrant/trusty-build/salt/roots state.highstate | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
-
+sudo -E salt-call --local --file-root=$(pwd)/vagrant/trusty-build/salt/roots state.highstate | multitee 0-1,4 4>/tmp/${BUILD_TAG}.out
 
 errs=$(sed --regexp-extended -n 's/^Failed:[[:space:]]+([[:digit:]]+)/\1/p' < /tmp/${BUILD_TAG}.out)
 rm /tmp/${BUILD_TAG}.out
@@ -19,4 +18,4 @@ if [ $errs != 0 ] ; then echo "$errs HIGHSTATE ERRORS, BUILD FAILED"; exit 1; fi
 cd $WORKSPACE
 rm -rf $BRANCH
 mkdir $BRANCH
-mv *deb $BRANCH
+mv pkgs/*deb $BRANCH