From: Alex Yang <yangyang1@zte.com.cn>
Date: Wed, 22 Feb 2017 15:22:05 +0000 (+0800)
Subject: Use jenkins-zte user, uncomment daisy deploy and cp labs dir
X-Git-Tag: danube.1.0~214
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=c752c85d1b5c6360e1195817784a740c1ca9d245

Use jenkins-zte user, uncomment daisy deploy and cp labs dir

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

diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index b303c2c05..b512e3f60 100755
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -22,9 +22,12 @@ cd $WORKSPACE
 BASE_DIR=$(cd ./;pwd)
 
 echo "Cloning securedlab repo $BRANCH"
-git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \
+git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \
     --branch $BRANCH
 
+# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir
+cp -r securedlab/labs .
+
 DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
                 -l $LAB_NAME -p $POD_NAME -B $BRIDGE"
 
@@ -45,7 +48,7 @@ $DEPLOY_COMMAND
 """
 
 # start the deployment
-#$DEPLOY_COMMAND
+$DEPLOY_COMMAND
 
 if [ $? -ne 0 ]; then
     echo