Use RDO trunk repos work for openvswitch on centos8

This is a bit of a hack, but allows installation of openvswitch for
testing the multinode roles.  Official CentOS 8 RDO builds are still a
work in progress, but this will let us get a head-start on any
multi-node testing.

Change-Id: I2eb1a16e9995a19d61e309aa59b232577184b527
This commit is contained in:
Ian Wienand 2019-11-25 12:05:33 +11:00 committed by Andreas Jaeger
parent f1cb8842a6
commit cfdf251140
4 changed files with 38 additions and 2 deletions

View File

@ -12,7 +12,16 @@ enabled=1
gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud
{% elif ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 %} {% elif ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 %}
[RDO-RHEL8-deps] [RDO-RHEL8-deps]
name=RedHat Openstack deps repo name=RedHat OpenStack deps repo
baseurl=https://trunk.rdoproject.org/rhel8-master/deps/latest/
gpgcheck=0
enabled=1
{% elif ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 8 %}
[RDO-RHEL8-deps]
# NOTE(ianw): 2019-11-25 RDO on centos8 is still in the process of
# being built. However, for our openvswitch dependency we can use
# this, for now.
name=RedHat OpenStack deps repo
baseurl=https://trunk.rdoproject.org/rhel8-master/deps/latest/ baseurl=https://trunk.rdoproject.org/rhel8-master/deps/latest/
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1

View File

@ -1,3 +1,8 @@
--- ---
ovs_package: "openvswitch" ovs_package: >-
{% if ansible_distribution_major_version|int >= 8 -%}
rhosp-openvswitch
{%- else -%}
openvswitch
{%- endif %}
ovs_service: "openvswitch" ovs_service: "openvswitch"

View File

@ -30,6 +30,7 @@ import ruamellib
PLATFORMS = [ PLATFORMS = [
'centos-7', 'centos-7',
'centos-8',
'debian-stretch', 'debian-stretch',
'fedora-29', 'fedora-29',
'gentoo-17-0-systemd', 'gentoo-17-0-systemd',

View File

@ -301,6 +301,25 @@
nodes: nodes:
- secondary - secondary
- job:
name: zuul-jobs-test-multinode-roles-centos-8
description: Tests multinode setup roles on centos-8
parent: zuul-jobs-test-multinode-roles
tags: auto-generated
nodeset:
nodes:
- name: primary
label: centos-8
- name: secondary
label: centos-8
groups:
- name: switch
nodes:
- primary
- name: peers
nodes:
- secondary
- job: - job:
name: zuul-jobs-test-multinode-roles-debian-stretch name: zuul-jobs-test-multinode-roles-debian-stretch
description: Tests multinode setup roles on debian-stretch description: Tests multinode setup roles on debian-stretch
@ -496,6 +515,7 @@
- zuul-jobs-test-netconsole - zuul-jobs-test-netconsole
- zuul-jobs-test-dstat-graph - zuul-jobs-test-dstat-graph
- zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-7
- zuul-jobs-test-multinode-roles-centos-8
- zuul-jobs-test-multinode-roles-debian-stretch - zuul-jobs-test-multinode-roles-debian-stretch
- zuul-jobs-test-multinode-roles-fedora-29 - zuul-jobs-test-multinode-roles-fedora-29
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
@ -525,6 +545,7 @@
- zuul-jobs-test-netconsole - zuul-jobs-test-netconsole
- zuul-jobs-test-dstat-graph - zuul-jobs-test-dstat-graph
- zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-7
- zuul-jobs-test-multinode-roles-centos-8
- zuul-jobs-test-multinode-roles-debian-stretch - zuul-jobs-test-multinode-roles-debian-stretch
- zuul-jobs-test-multinode-roles-fedora-29 - zuul-jobs-test-multinode-roles-fedora-29
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd