From: meimei <meimei@huawei.com>
Date: Wed, 20 Jul 2016 01:23:52 +0000 (+0800)
Subject: [compass]zenial deployment bugfix
X-Git-Tag: colorado.1.0~251
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3139641fc9279e34e850f8d4433ba100493c8af9;p=releng.git

[compass]zenial deployment bugfix

Change-Id: Iaced24782396f78d0620f4283b33c644739f88e7
Signed-off-by: meimei <meimei@huawei.com>
---

diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 025984990..0231ea588 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -47,7 +47,7 @@ cd $WORKSPACE
 export OS_VERSION=${COMPASS_OS_VERSION}
 export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
 if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
-    export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION}
+    export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
 fi
 ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
 if [ $? -ne 0 ]; then