Code Review / releng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 956b45c)
[compass] set newton as a opention of openstack 05/24605/2
authormeimei <meimei@huawei.com>
Mon, 21 Nov 2016 07:11:14 +0000 (15:11 +0800)
committermeimei <meimei@huawei.com>
Mon, 21 Nov 2016 08:05:38 +0000 (16:05 +0800)
Change-Id: I403a942ffb176c89b862bd6a19d5dea40cf1884c
Signed-off-by: meimei <meimei@huawei.com>
jjb/compass4nfv/compass-ci-jobs.yml patch | blob | history
jjb/compass4nfv/compass-deploy.sh patch | blob | history
jjb/compass4nfv/compass-project-jobs.yml patch | blob | history
jjb/compass4nfv/compass-verify-jobs.yml patch | blob | history

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index eb91131..d806195 100644 (file)
--- 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 65e44b6..aa3bd36 100644 (file)
--- 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 3a52e91..4d01610 100644 (file)
--- 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 82e3dfd..ece59b2 100644 (file)
--- 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: