don't set newton as default value for the moment

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

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index d806195..b70bfc6 100644 (file)
--- 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 aa3bd36..2567179 100644 (file)
--- 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 4d01610..50ff072 100644 (file)
--- 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 ece59b2..87c19a9 100644 (file)
--- 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