summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-11-21 08:41:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-21 08:41:29 +0000
commit93fa3c572de6d7d249343b50ccd7bfb4ce8d43da (patch)
treec0649573e28fc27c4c4c086575b441601f3804b6
parenta014696a2ba8798e35a332eb5f2952535393e51f (diff)
parentb2ffb847c29bfdf7ae6bacb19da7419d076b6b8a (diff)
Merge "[compass] set newton as a opention of openstack"
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml1
-rw-r--r--jjb/compass4nfv/compass-deploy.sh2
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml1
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml1
4 files changed, 4 insertions, 1 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index eb9113114..d806195b0 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -247,6 +247,7 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
+ - 'newton'
- 'mitaka'
- 'liberty'
- choice:
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 65e44b670..aa3bd3619 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -29,7 +29,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
+if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" || "${OPENSTACK_VERSION}" = "newton" ]]; then
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 3a52e91c9..4d01610a0 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -124,6 +124,7 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
+ - 'newton'
- 'mitaka'
- 'liberty'
- choice:
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 82e3dfdf2..ece59b2c2 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -242,6 +242,7 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
+ - 'newton'
- 'mitaka'
- 'liberty'
- choice: