summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-04-04 07:07:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-04 07:07:13 +0000
commit7adc859a96ecbfce421bd4367e98e00f33069d04 (patch)
treed0b9d84a532ebbb5ad2f58a7f9239ecc225b2003 /jjb/daisy4nfv
parentf1751183fe77d358008ecb0f986fefd9f545b4ad (diff)
parent6e39235acdfbc641b431b2d8c967365325be661d (diff)
Merge "[daisy] Support doctor in daisy master branch"
Diffstat (limited to 'jjb/daisy4nfv')
-rwxr-xr-xjjb/daisy4nfv/daisy-deploy.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index f729c380e..ea57ab1b4 100755
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -27,6 +27,12 @@ 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"
@@ -35,7 +41,8 @@ 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 """