From 1dbba7f70e2cbdc642f8c88a5d07b5449670ae9e Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Mon, 21 Sep 2020 12:17:06 +0200 Subject: [PATCH] Use Train repo to install openvswitch from multi-node-bridge in CentOS 8 Currently it's using master repo for CentOS 8. RDO s updating the version of OVS in master to 2.13 while previous releases use version 2.12 so it's a problem to install 2.13 for jobs gating reviews for Train or Ussuri. This review is moving to use Train repository to install openvswitch in all CentOS 8 jobs as it's the older version supported on CentOS 8. Note that CI jobs running with this multi-node setup configure proper repos for the tested release (ussuri, victoria or master) at a later stage and update the version of OpenvSwitch to the one included on each specific release repo. Closes-Bug: #1896469 Change-Id: Ie30997f360b285131cb5051d582da2a15cca7205 --- .../templates/zuul-multi-node-bridge-ovs.repo.j2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 index fb63ba0e2..95d1857ab 100644 --- a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 +++ b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 @@ -12,8 +12,12 @@ enabled=1 gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud {% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int >= 8 %} [RDO-CentOS8-deps] -name=CentOS OpenStack deps repo -baseurl=https://trunk.rdoproject.org/centos8-master/deps/latest/ +name=CentOS OpenStack Train Repository +{% if zuul_site_mirror_fqdn is defined %} +baseurl=http://{{ zuul_site_mirror_fqdn }}/centos/8/cloud/$basearch/openstack-train/ +{% else %} +baseurl=http://mirror.centos.org/centos/8/cloud/$basearch/openstack-train/ +{% endif %} gpgcheck=0 enabled=1 {% endif %}