diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-10-16 01:46:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-16 01:46:17 +0000 |
| commit | 2dab5a73f0ab1376d924559e2809be0bffe33103 (patch) | |
| tree | 089f25bc786a1658aa56e4042bd2d02d99e28c0a /jjb/daisy4nfv | |
| parent | 51875bd0ad16530ad5179e32859b132ea1e1a534 (diff) | |
| parent | 5b64bcc0933fe77d92a0c03e41deda70bbfaca15 (diff) | |
Merge "Move securedlab clone outside of daisy WORKSPACE"
Diffstat (limited to 'jjb/daisy4nfv')
| -rwxr-xr-x | jjb/daisy4nfv/daisy-deploy.sh | 13 |
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... -------------------------------------------------------- |