diff options
| author |   meimei <meimei@huawei.com> | 2016-07-18 16:11:19 +0800 |
|---|---|---|
| committer | mei mei <meimei@huawei.com> | 2016-07-19 01:20:47 +0000 |
| commit | 9b309a51289a1f82201d743055d5589bcfa64541 (patch) | |
| tree | 223073df036f72cd7c2bc3b776417787d44239e6 /jjb | |
| parent | 0425c8733b6d4a40bbf4c81d71f8fc85cd3eac3d (diff) | |
[compass] COMPASS vm Support ubuntu 16.04
JIRA: COMPASS-431
Change-Id: I42b632170f4423627b57bdc21f5d5718a46067b0
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index cfa8051c0..6bfc73778 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -220,6 +220,11 @@ choices: - 'mitaka' - 'liberty' + - choice: + name: COMPASS_OS_VERSION_OPTION + choices: + - '' + - 'xenial' ######################## # trigger macros diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 68a93a15b..025984990 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -46,6 +46,9 @@ 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} +fi ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} if [ $? -ne 0 ]; then echo "depolyment failed!" |