summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2016-11-21 02:48:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-21 02:48:31 +0000
commita014696a2ba8798e35a332eb5f2952535393e51f (patch)
tree05186cfb89e37ad45faa542182676f0c9e471ea1
parent956b45c6cda30baea8f8e41b33e8b49a684f12bd (diff)
parent900c31487a2160e8f4e07dc46d1ef8c9417f65bb (diff)
Merge "Implement virtual deployment in merge job of Daisy4nfv CI"
-rwxr-xr-xjjb/daisy4nfv/daisy4nfv-virtual-deploy.sh21
1 files changed, 21 insertions, 0 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
index 8936be6c4..9de494fc2 100755
--- a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
+++ b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
@@ -4,3 +4,24 @@ echo "--------------------------------------------------------"
echo "This is diasy4nfv virtual deploy job!"
echo "--------------------------------------------------------"
+cd $WORKSPACE
+
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+ export NETWORK_CONF=./deploy/config/vm_environment/$NODE_NAME/network.yml
+ export DHA_CONF=./deploy/config/vm_environment/$NODE_NAME/deploy.yml
+else
+ exit 1
+fi
+
+./ci/deploy/deploy.sh ${DHA_CONF} ${NETWORK_CONF}
+
+if [ $? -ne 0 ]; then
+ echo "depolyment failed!"
+ deploy_ret=1
+fi
+
+echo
+echo "--------------------------------------------------------"
+echo "Done!"
+
+exit $deploy_ret