Disable blocking on buildable queue (Functest)

[releng.git] / jjb / daisy4nfv / daisy-deploy.sh

diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index 1723fd1..950b9be 100755 (executable)
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -17,7 +17,7 @@ if [[ ! "$NODE_NAME" =~ "-virtual" ]] && [[ ! "$LAB_NAME" =~ (zte) ]]; then
     exit $deploy_ret
 fi
 
-# clone the securedlab repo
+# clone the securedlab/pharos repo
 cd $WORKSPACE
 
 # There are no PDFs in euphrates branch of pharos repo.
@@ -27,15 +27,22 @@ else
     CONFIG_REPO_NAME=pharos
 fi
 
+if [[  "$BRANCH" =~ "master" ]]; then
+    DOCTOR_OPT="-d 1"
+else
+    DOCTOR_OPT=""
+fi
+
 LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME}
 
 echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR"
-rm -rf $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 -E ./ci/deploy/deploy.sh -L $LABS_DIR \
-                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
+                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \
+                $DOCTOR_OPT"
 
 # log info to console
 echo """