diff options
| author |   meimei <meimei@huawei.com> | 2016-11-22 09:32:20 +0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2016-11-22 09:36:56 +0800 |
| commit | 7f8a17e1a855ff94be820f7e147b80b1d83ba609 (patch) | |
| tree | 614386c39db860f259aca5dd3e471c82096c1858 | |
| parent | 93fa3c572de6d7d249343b50ccd7bfb4ce8d43da (diff) | |
don't set newton as default value for the moment
Change-Id: I6137f9dbeed1b15c3e6fc7d63bb1892cf2b9471e
Signed-off-by: meimei <meimei@huawei.com>
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index d806195b0..b70bfc67b 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -247,8 +247,8 @@ - choice: name: COMPASS_OPENSTACK_VERSION choices: - - 'newton' - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION_OPTION diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index aa3bd3619..256717953 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -29,10 +29,15 @@ cd $WORKSPACE export OS_VERSION=${COMPASS_OS_VERSION} export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} -if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" || "${OPENSTACK_VERSION}" = "newton" ]]; then +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 +if [[ "${OPENSTACK_VERSION}" = "newton" ]]; then + export OS_VERSION="xenial" + export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION} +fi + if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 4d01610a0..50ff072fb 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -124,8 +124,8 @@ - choice: name: COMPASS_OPENSTACK_VERSION choices: - - 'newton' - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index ece59b2c2..87c19a9c5 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -242,8 +242,8 @@ - choice: name: COMPASS_OPENSTACK_VERSION choices: - - 'newton' - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION |