Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bottlenecks: enable daily deploy job.
[releng.git]
/
jjb
/
daisy4nfv
/
daisy-deploy.sh
diff --git
a/jjb/daisy4nfv/daisy-deploy.sh
b/jjb/daisy4nfv/daisy-deploy.sh
index
b303c2c
..
0bcac4b
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 "--------------------------------------------------------"
echo "This is $INSTALLER_TYPE deploy job!"
echo "--------------------------------------------------------"
-DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-ha"}
+DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-
no
ha"}
BRIDGE=${BRIDGE:-pxebr}
LAB_NAME=${NODE_NAME/-*}
POD_NAME=${NODE_NAME/*-}
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"
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
--branch $BRANCH
-DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
- -l $LAB_NAME -p $POD_NAME -B $BRIDGE"
+# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir
+cp -r securedlab/labs .
+
+DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -b $BASE_DIR \
+ -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
# log info to console
echo """
# log info to console
echo """
@@
-45,7
+48,7
@@
$DEPLOY_COMMAND
"""
# start the deployment
"""
# start the deployment
-
#
$DEPLOY_COMMAND
+$DEPLOY_COMMAND
if [ $? -ne 0 ]; then
echo
if [ $? -ne 0 ]; then
echo