openstack/kayobe
Code Issues Proposed changes

CentOS 8: Add seed and overcloud CI jobs, drop CentOS 7 jobs

Browse Source 
CentOS 8 removes interfaces from their bridge during ifdown, and removes
the bridge if there are no interfaces left. When Kayobe bounces veth
links plugged into the bridge, it causes the bridge which has the IP we
are using for SSH to be removed. Use a dummy interface in CI to avoid
this problem.

Kolla-ansible has dropped all CentOS 7 jobs on master now, and prechecks
only allow CentOS 7 hosts. Drop all CentOS 7 jobs. We will have to run
without upgrade jobs in place until Train supports CentOS 8.

Depends-On: https://review.opendev.org/695881

Change-Id: I7c1a885b36445e33d4db1b1c8533db28a644b4a1
Story: 2006574
Task: 38870
This commit is contained in:
Mark Goddard 2020-02-25 16:24:28 +00:00
parent 71d36cbe5e
commit b0359e37df
8 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/baremetal-compute-inspect.yml
View File

@ -6,7 +6,7 @@
# We install openstacksdk in a virtualenv on one of the controllers, and delegate to
# it when executing the stackhpc.os-ironic-state role.
- name: Ensure dependencies are installed and the virtual environment is activated
- name: Ensure dependencies are installed
hosts: controllers[0]
gather_facts: true
vars:

7
playbooks/kayobe-overcloud-base/overrides.yml.j2
View File

@ -17,3 +17,10 @@ pip_upper_constraints_file: "/tmp/upper-constraints.txt"
# Use the CI infra's PyPI mirror.
pip_local_mirror: true
pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
# and removes the bridge if there are no interfaces left. When Kayobe bounces
# veth links plugged into the bridge, it causes the bridge which has the IP we
# are using for SSH to be removed. Use a dummy interface.
aio_bridge_ports:
- dummy1

8
playbooks/kayobe-overcloud-base/pre.yml
View File

@ -19,6 +19,14 @@
- "ip l add breth1 type bridge"
- "ip l set breth1 up"
- "ip a add 192.168.33.3/24 dev breth1"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during
# ifdown, and removes the bridge if there are no interfaces left. When
# Kayobe bounces veth links plugged into the bridge, it causes the
# bridge which has the IP we are using for SSH to be removed. Use a
# dummy interface.
- "ip l add dummy1 type dummy"
- "ip l set dummy1 up"
- "ip l set dummy1 master breth1"
- name: Ensure kayobe is installed
shell:

7
playbooks/kayobe-seed-base/overrides.yml.j2
View File

@ -21,3 +21,10 @@ overcloud_host_image_workaround_resolv_enabled: false
# Use the CI infra's PyPI mirror.
pip_local_mirror: true
pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
# and removes the bridge if there are no interfaces left. When Kayobe bounces
# veth links plugged into the bridge, it causes the bridge which has the IP we
# are using for SSH to be removed. Use a dummy interface.
aio_bridge_ports:
- dummy1

8
playbooks/kayobe-seed-base/pre.yml
View File

@ -29,6 +29,14 @@
- "ip l add breth1 type bridge"
- "ip l set breth1 up"
- "ip a add 192.168.33.5/24 dev breth1"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during
# ifdown, and removes the bridge if there are no interfaces left. When
# Kayobe bounces veth links plugged into the bridge, it causes the
# bridge which has the IP we are using for SSH to be removed. Use a
# dummy interface.
- "ip l add dummy1 type dummy"
- "ip l set dummy1 up"
- "ip l set dummy1 master breth1"
- name: Ensure kayobe is installed
shell:

16
zuul.d/jobs.yaml
View File

@ -92,9 +92,9 @@
timeout: 7200
- job:
name: kayobe-overcloud-centos
name: kayobe-overcloud-centos8
parent: kayobe-overcloud-base
nodeset: kayobe-centos
nodeset: kayobe-centos8
- job:
name: kayobe-overcloud-upgrade-base
@ -112,9 +112,9 @@
attempts: 3
- job:
name: kayobe-overcloud-upgrade-centos
name: kayobe-overcloud-upgrade-centos8
parent: kayobe-overcloud-upgrade-base
nodeset: kayobe-centos
nodeset: kayobe-centos8
- job:
name: kayobe-seed-base
@ -128,9 +128,9 @@
timeout: 5400
- job:
name: kayobe-seed-centos
name: kayobe-seed-centos8
parent: kayobe-seed-base
nodeset: kayobe-centos
nodeset: kayobe-centos8
- job:
name: kayobe-seed-upgrade-base
@ -148,6 +148,6 @@
attempts: 3
- job:
name: kayobe-seed-upgrade-centos
name: kayobe-seed-upgrade-centos8
parent: kayobe-seed-upgrade-base
nodeset: kayobe-centos
nodeset: kayobe-centos8

6
zuul.d/nodesets.yaml
View File

@ -4,3 +4,9 @@
nodes:
- name: primary
label: centos-7
- nodeset:
name: kayobe-centos8
nodes:
- name: primary
label: centos-8

20
zuul.d/project.yaml
View File

@ -10,10 +10,12 @@
- kayobe-tox-ansible-syntax
- kayobe-tox-ansible
- kayobe-tox-molecule
- kayobe-overcloud-centos
- kayobe-overcloud-upgrade-centos
- kayobe-seed-centos
- kayobe-seed-upgrade-centos
- kayobe-overcloud-centos8
# TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
# - kayobe-overcloud-upgrade-centos8
- kayobe-seed-centos8
# TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
# - kayobe-seed-upgrade-centos8
gate:
queue: kayobe
@ -21,7 +23,9 @@
- kayobe-tox-ansible-syntax
- kayobe-tox-ansible
- kayobe-tox-molecule
- kayobe-overcloud-centos
- kayobe-overcloud-upgrade-centos
- kayobe-seed-centos
- kayobe-seed-upgrade-centos
- kayobe-overcloud-centos8
# TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
# - kayobe-overcloud-upgrade-centos8
- kayobe-seed-centos8
# TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
# - kayobe-seed-upgrade-centos