From: zeyu zhu <zhu.zeyu@zte.com.cn>
Date: Thu, 17 Nov 2016 03:18:46 +0000 (+0800)
Subject: Implement virtual deployment in merge job of Daisy4nfv CI
X-Git-Tag: danube.1.0~620^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F24459%2F3;p=releng.git

Implement virtual deployment in merge job of Daisy4nfv CI

Change-Id: I2f0edea6a2f527e800c953458b4bb31741e970ab
Signed-off-by: zeyu zhu <zhu.zeyu@zte.com.cn>
---

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