summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2016-12-19 03:02:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-19 03:02:25 +0000
commit74511739daccd406854c179b39728e56a8edddef (patch)
tree7f66618ad5e72c8ee4e9b823c0fb684e3f65665c
parent6d2218c7b4295cd0764f4dbc1f3d5bf270b6cdc1 (diff)
parentbb14ee3615accbc8a7f17aeab619956f9fd3bf4e (diff)
Merge "virfy and daily only support newton xenial"
-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'