[daisy] Support doctor in daisy master branch

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

diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index b512e3f..ea57ab1 100755 (executable)
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -6,7 +6,7 @@ echo "--------------------------------------------------------"
 echo "This is $INSTALLER_TYPE deploy job!"
 echo "--------------------------------------------------------"
 
-DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-ha"}
+DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-noha"}
 BRIDGE=${BRIDGE:-pxebr}
 LAB_NAME=${NODE_NAME/-*}
 POD_NAME=${NODE_NAME/*-}
@@ -19,17 +19,30 @@ 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
+
+if [[  "$BRANCH" =~ "master" ]]; then
+    DOCTOR_OPT="-d 1"
+else
+    DOCTOR_OPT=""
+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 \
-                -l $LAB_NAME -p $POD_NAME -B $BRIDGE"
+DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \
+                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \
+                $DOCTOR_OPT"
 
 # log info to console
 echo """
@@ -39,7 +52,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...
 --------------------------------------------------------