summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-06-03 20:47:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-03 20:47:10 +0000
commit199982ce96b8b468e4d4526eda77e117726fb015 (patch)
tree2f3622c9d6ea4cd2656b492bb03f1edcce0e946a
parentad5ee11ce822e0ba69eeaf36dc14512098f2b8b6 (diff)
parentaabaa4dec645605fd1c3c0b0ffdf7341b4013fec (diff)
Merge "Pass scenario argument to deploy.sh"
-rwxr-xr-xjjb/daisy4nfv/daisy-deploy.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index b512e3f60..785f3a571 100755
--- 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/*-}
@@ -29,7 +29,7 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \
cp -r securedlab/labs .
DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
- -l $LAB_NAME -p $POD_NAME -B $BRIDGE"
+ -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
# log info to console
echo """