aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-03-18 14:45:17 +0000
committerMark Goddard <mark@stackhpc.com>2019-03-18 14:46:56 +0000
commit39410b01988d01d79f8c4e7645bdc4bfffcd0a6e (patch)
treed64aa828bfdc7ee696fa59da7f997824589205db
parent949360642f27bb40469e9ec2cea104eee87f59fd (diff)
downloadkolla-ansible-39410b01988d01d79f8c4e7645bdc4bfffcd0a6e.tar.gz
kolla-ansible-39410b01988d01d79f8c4e7645bdc4bfffcd0a6e.zip
Run jobs on bionic instead of xenial
Migrate to the latest Ubuntu LTS release 18.04 aka Bionic. See [0] for the big picture. Also test running tox jobs on Bionic. [0] https://etherpad.openstack.org/p/devstack-bionic Change-Id: I96e7b8d17bc1e92716c04fdcf362c2adb08a2212
-rw-r--r--zuul.d/jobs.yaml10
-rw-r--r--zuul.d/nodesets.yaml24
2 files changed, 29 insertions, 5 deletions
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ce5cee943..a1a6898bc 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -10,7 +10,7 @@
- job:
name: kolla-ansible-ubuntu-source
parent: kolla-ansible-base
- nodeset: kolla-ansible-xenial
+ nodeset: kolla-ansible-bionic
vars:
base_distro: ubuntu
install_type: source
@@ -36,7 +36,7 @@
- job:
name: kolla-ansible-ubuntu-binary
parent: kolla-ansible-base
- nodeset: kolla-ansible-xenial
+ nodeset: kolla-ansible-bionic
voting: false
vars:
base_distro: ubuntu
@@ -54,7 +54,7 @@
- job:
name: kolla-ansible-ubuntu-source-ceph
parent: kolla-ansible-base
- nodeset: kolla-ansible-xenial-multi
+ nodeset: kolla-ansible-bionic-multi
voting: false
vars:
base_distro: ubuntu
@@ -105,7 +105,7 @@
- job:
name: kolla-ansible-ubuntu-source-cinder-lvm
parent: kolla-ansible-base
- nodeset: kolla-ansible-xenial-multi
+ nodeset: kolla-ansible-bionic-multi
voting: false
vars:
base_distro: ubuntu
@@ -133,7 +133,7 @@
- job:
name: kolla-ansible-ubuntu-source-zun
parent: kolla-ansible-base
- nodeset: kolla-ansible-xenial
+ nodeset: kolla-ansible-bionic
voting: false
vars:
base_distro: ubuntu
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 5890e8c18..bbc8a0f41 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -12,6 +12,12 @@
label: ubuntu-xenial
- nodeset:
+ name: kolla-ansible-bionic
+ nodes:
+ - name: primary
+ label: ubuntu-bionic
+
+- nodeset:
name: kolla-ansible-xenial-multi
nodes:
- name: primary
@@ -30,6 +36,24 @@
- secondary2
- nodeset:
+ name: kolla-ansible-bionic-multi
+ nodes:
+ - name: primary
+ label: ubuntu-bionic
+ - name: secondary1
+ label: ubuntu-bionic
+ - name: secondary2
+ label: ubuntu-bionic
+ groups:
+ - name: switch
+ nodes:
+ - primary
+ - name: peers
+ nodes:
+ - secondary1
+ - secondary2
+
+- nodeset:
name: kolla-ansible-centos-multi
nodes:
- name: primary