X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdaisy4nfv%2Fdaisy-deploy.sh;h=f729c380e7f6230f011239ba57a26633e779baac;hb=5f9c32e9fb4048677150bf541e8f5c3cc3d43001;hp=785f3a571faa1e940c3f5be270e1d6d1743963dd;hpb=2898aade06c834cbe2f2d6b3a212e1cf5accaf09;p=releng.git diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index 785f3a571..f729c380e 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -19,16 +19,22 @@ fi # clone the securedlab repo cd $WORKSPACE -BASE_DIR=$(cd ./;pwd) -echo "Cloning securedlab repo $BRANCH" -git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \ - --branch $BRANCH +# There are no PDFs in euphrates branch of pharos repo. +if [[ "$BRANCH" =~ "euphrates" ]]; then + CONFIG_REPO_NAME=securedlab +else + CONFIG_REPO_NAME=pharos +fi + +LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME} -# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir -cp -r securedlab/labs . +echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR" +sudo rm -rf $LABS_DIR +git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \ + --quiet --branch $BRANCH $LABS_DIR -DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \ +DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \ -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO" # log info to console @@ -39,7 +45,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... --------------------------------------------------------