summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/daisy4nfv/daisy-deploy.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index 0bcac4b02..803ff5b03 100755
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -19,16 +19,14 @@ fi
# clone the securedlab repo
cd $WORKSPACE
-BASE_DIR=$(cd ./;pwd)
+SECURELAB_DIR=/var/tmp/opnfv-securedlab
-echo "Cloning securedlab repo $BRANCH"
+echo "Cloning securedlab repo $BRANCH to $SECURELAB_DIR"
+rm -rf $SECURELAB_DIR
git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \
- --branch $BRANCH
+ --branch $BRANCH $SECURELAB_DIR
-# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir
-cp -r securedlab/labs .
-
-DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -b $BASE_DIR \
+DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $SECURELAB_DIR \
-l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
# log info to console
@@ -39,7 +37,6 @@ Scenario: $DEPLOY_SCENARIO
LAB: $LAB_NAME
POD: $POD_NAME
BRIDGE: $BRIDGE
-BASE_DIR: $BASE_DIR
Starting the deployment using $INSTALLER_TYPE. This could take some time...
--------------------------------------------------------