X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-deploy.sh;h=785f3a571faa1e940c3f5be270e1d6d1743963dd;hb=55667d21f12f21317d52cb8b3b753ea92a037ccc;hp=b303c2c0512d89225288e5d7cf688ad4b231db82;hpb=052bb66ad662a0a843c347bc32be03f11bc70f07;p=releng.git diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index b303c2c05..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/*-} @@ -22,11 +22,14 @@ cd $WORKSPACE BASE_DIR=$(cd ./;pwd) echo "Cloning securedlab repo $BRANCH" -git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \ +git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \ --branch $BRANCH +# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir +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 """ @@ -45,7 +48,7 @@ $DEPLOY_COMMAND """ # start the deployment -#$DEPLOY_COMMAND +$DEPLOY_COMMAND if [ $? -ne 0 ]; then echo