From: meimei <meimei@huawei.com>
Date: Mon, 21 Nov 2016 07:11:14 +0000 (+0800)
Subject: [compass] set newton as a opention of openstack
X-Git-Tag: danube.1.0~643^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b2ffb847c29bfdf7ae6bacb19da7419d076b6b8a;p=releng.git

[compass] set newton as a opention of openstack

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

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: