From aabaa4dec645605fd1c3c0b0ffdf7341b4013fec Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Thu, 1 Jun 2017 06:14:27 -0400
Subject: Pass scenario argument to deploy.sh
Also change default value to os-nosdn-nofeature-noha
Change-Id: I018179b4018440809382b4a46d2bb29a0762757c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
jjb/daisy4nfv/daisy-deploy.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'jjb')
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 """
--
cgit