From: Alex Yang <yangyang1@zte.com.cn>
Date: Thu, 10 Aug 2017 02:43:39 +0000 (+0800)
Subject: Pass jenkins variables to daisy deploy script
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ac59ab0bb9184049b92923907d5d5d07f9270da0;hp=5159aeef7922689444dfffbf6437c1d81217b6c7;p=releng.git

Pass jenkins variables to daisy deploy script

JIRA: DAISY-42

Now the daisy deploy script is executed with sudo. In [1], daisy
deploy job needs to check INSTALLER_IP when it generates the
configuration by the POD Descriptor File. So -E option of sudo
is necessary to pass the jenkins variables.

[1] https://gerrit.opnfv.org/gerrit/#/c/38657/

Change-Id: I852c115d1f0623100afef9979619e4770b5bd1d3
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---

diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index 785f3a571..0bcac4b02 100755
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -28,7 +28,7 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \
 # daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir
 cp -r securedlab/labs .
 
-DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
+DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -b $BASE_DIR \
                 -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
 
 # log info to console