zuul/zuul-jobs
Code Issues Proposed changes

Donot Setup RDO gpg keys and repo for RHEL and Fedora

Browse Source 
Currently in multi-node-bridge role, For RHEL and CentOS
distro, RDO repos are setted up and from where rdo-openvswitch
get pulled in RHEL deployment and causes unwanted failures.

Like a particular version of rdo-openvswitch is not yet available
in CentOS and it fails the job with nothing provides message.

Enabling RDO repos specifically for CentOS and other distros
except RHEL and Fedora will fix the
issue.

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: Id68f5904c4ec3d667a16e9f4f195d53b02d29cec
This commit is contained in:
Chandan Kumar (raukadah) 2022-04-14 15:13:11 +05:30
parent 82d321c6fd
commit 8399dd1842
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/multi-node-bridge/tasks/common.yaml
View File

@ -12,7 +12,7 @@
# from installing repositories we don't need.
- when:
- ansible_os_family == "RedHat"
- ansible_distribution != "Fedora"
- ansible_distribution not in ["Fedora", "RedHat"]
become: yes
block:
- name: Set up RDO GPG key

6
roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2
View File

@ -1,5 +1,5 @@
# Vendored from rdo-release: https://github.com/rdo-infra/rdo-release
{% if ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int <= 7 %}
{% if ansible_distribution_major_version|int <= 7 %}
[centos-openstack-queens]
name=CentOS OpenStack Queens Repository
{% if zuul_site_mirror_fqdn is defined %}
@ -10,7 +10,7 @@ baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-queens/
gpgcheck=1
enabled=1
gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud
{% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int == 8 %}
{% elif ansible_distribution_major_version|int == 8 %}
[RDO-CentOS8-deps]
name=CentOS OpenStack Train Repository
{% if zuul_site_mirror_fqdn is defined %}
@ -22,7 +22,7 @@ gpgcheck=0
enabled=1
# TODO: Replace testing repo once C9 released repos as available. Currently Centos9 stream release
# repos are not available so need to use testing repo available at buildlogs.centos.org.
{% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int == 9 %}
{% elif ansible_distribution_major_version|int == 9 %}
[RDO-CentOS9-stream-deps]
name=CentOS OpenStack Xena Repository
{% if zuul_site_mirror_fqdn is defined %}