From 788cb4d77ce01bffb7d0aa16b5a6b1a71d391f1c Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 18 Aug 2016 14:12:42 +0200 Subject: [PATCH] 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 --- calamari-server-trusty/build/build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 -- 2.47.3