Fix CI jobs in yoga and move to unmaintained/yoga branch name

Move yoga to unmaintained/yoga branch name after switch to unmaintained
status for consistency with openstack core projects.

Also, add workaround for issue mariadb:10.11 module

Issue: https://issues.redhat.com/browse/RDO-241

Change-Id: I1332cb7348148e47730fb7cfa4827328657b87b0
This commit is contained in:
Alfredo Moralejo 2024-02-29 09:11:32 +01:00
parent cedde61e9d
commit 091ff9ecec
4 changed files with 32 additions and 25 deletions

View File

@ -2,4 +2,4 @@
host=review.opendev.org
port=29418
project=x/packstack.git
defaultbranch=stable/yoga
defaultbranch=unmaintained/yoga

View File

@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules'
mod 'aodh',
:git => 'https://github.com/openstack/puppet-aodh',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'ceilometer',
:git => 'https://github.com/openstack/puppet-ceilometer',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'cinder',
:git => 'https://github.com/openstack/puppet-cinder',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'glance',
:git => 'https://github.com/openstack/puppet-glance',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'gnocchi',
:git => 'https://github.com/openstack/puppet-gnocchi',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'heat',
:git => 'https://github.com/openstack/puppet-heat',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'magnum',
:git => 'https://github.com/openstack/puppet-magnum',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'horizon',
:git => 'https://github.com/openstack/puppet-horizon',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'ironic',
:git => 'https://github.com/openstack/puppet-ironic',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'keystone',
:git => 'https://github.com/openstack/puppet-keystone',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'manila',
:git => 'https://github.com/openstack/puppet-manila',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'neutron',
:git => 'https://github.com/openstack/puppet-neutron',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'nova',
:git => 'https://github.com/openstack/puppet-nova',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'openstack_extras',
:git => 'https://github.com/openstack/puppet-openstack_extras',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'openstacklib',
:git => 'https://github.com/openstack/puppet-openstacklib',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'oslo',
:git => 'https://github.com/openstack/puppet-oslo',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'ovn',
:git => 'https://github.com/openstack/puppet-ovn',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'placement',
:git => 'https://github.com/openstack/puppet-placement',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'sahara',
:git => 'https://github.com/openstack/puppet-sahara',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'swift',
:git => 'https://github.com/openstack/puppet-swift',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'tempest',
:git => 'https://github.com/openstack/puppet-tempest',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'trove',
:git => 'https://github.com/openstack/puppet-trove',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
mod 'vswitch',
:git => 'https://github.com/openstack/puppet-vswitch',
:ref => 'stable/yoga'
:ref => 'unmaintained/yoga'
## Non-OpenStack modules

View File

@ -27,3 +27,10 @@
chdir: '{{ ansible_user_dir }}/workspace'
become: true
environment: '{{ zuul }}'
# mariadb-10.11 is broken https://issues.redhat.com/browse/RDO-241
- name: Temporary disable mariadb module
shell: "sudo dnf module disable -y mariadb"
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "9"
become: true
changed_when: False

View File

@ -17,7 +17,7 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin
SCENARIO=${SCENARIO:-scenario001}
BRANCH=stable/yoga
BRANCH=unmaintained/yoga
# Find OS version and release
source /etc/os-release