Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use jenkins-zte user, uncomment daisy deploy and cp labs dir
[releng.git]
/
jjb
/
daisy4nfv
/
daisy-deploy.sh
diff --git
a/jjb/daisy4nfv/daisy-deploy.sh
b/jjb/daisy4nfv/daisy-deploy.sh
index
b303c2c
..
b512e3f
100755
(executable)
--- a/
jjb/daisy4nfv/daisy-deploy.sh
+++ b/
jjb/daisy4nfv/daisy-deploy.sh
@@
-22,9
+22,12
@@
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
+# 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"
DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
-l $LAB_NAME -p $POD_NAME -B $BRIDGE"
@@
-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