summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-19 09:05:33 +0800
committerliyuenan <liyuenan@huawei.com>2016-12-19 09:24:13 +0800
commitbb14ee3615accbc8a7f17aeab619956f9fd3bf4e (patch)
tree7a55ebea822dfbecd2e4534f2c01ed23f44d0681
parentb2bc05dad00f551cdcaa10c4f3864adc67639dbf (diff)
virfy and daily only support newton xenial
Change-Id: I99c5d32f4c9f2e1057c74c136646a37cc09c1922 Signed-off-by: liyuenan <liyuenan@huawei.com>
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml6
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml11
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml13
3 files changed, 5 insertions, 25 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index e9d1f5302..7b810087c 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -22,11 +22,11 @@
pod:
- baremetal:
slave-label: compass-baremetal
- os-version: 'trusty'
+ os-version: 'xenial'
<<: *master
- virtual:
slave-label: compass-virtual
- os-version: 'trusty'
+ os-version: 'xenial'
<<: *master
# - baremetal:
# slave-label: compass-baremetal
@@ -235,9 +235,7 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- - 'liberty'
########################
# trigger macros
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index ac132a577..3733ec971 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -115,15 +115,4 @@
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- - choice:
- name: COMPASS_OPENSTACK_VERSION
- choices:
- - 'mitaka'
- - 'newton'
- - 'liberty'
- - choice:
- name: COMPASS_OS_VERSION
- choices:
- - 'trusty'
- - 'centos7'
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 3a11b1e0a..2277e92ab 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -18,13 +18,9 @@
disabled: true
distro:
- - 'trusty':
+ - 'xenial':
disabled: false
- os-version: 'trusty'
- openstack-os-version: ''
- - 'centos7':
- disabled: false
- os-version: 'centos7'
+ os-version: 'xenial'
openstack-os-version: ''
#####################################
# patch verification phases
@@ -232,11 +228,8 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- - 'liberty'
- choice:
name: COMPASS_OS_VERSION
choices:
- - 'trusty'
- - 'centos7'
+ - 'xenial'