summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-07-21 14:29:12 +0800
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-07-21 09:32:30 +0000
commita510a653663b917c7910b4934c580060837965d0 (patch)
tree6f38bbd4c6bf29b20439b35e6af75a17e235deee /jjb
parent0c71d6ea67f3d9b52849ca15b01da0aee379d657 (diff)
bugfix: should reset os_version from os_version_option
Change-Id: Ifcd9355055405c9c4f89a774d7a8fc44997884e3 Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-deploy.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 0231ea588..c70a4ec53 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -48,6 +48,7 @@ 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}_${COMPASS_OS_VERSION_OPTION}
+ export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
if [ $? -ne 0 ]; then