From 3b311eee026b5847945a22da06b95cfce3731533 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 5 Apr 2022 20:02:07 +0900 Subject: [PATCH] Switch to stable/yoga Change-Id: I30730722696c7400f77865c00d139dc89c94e325 --- Puppetfile | 70 ++++++++++++++--------------- zuul.d/base.yaml | 114 +++++++++++++++++++++++++++++++---------------- 2 files changed, 111 insertions(+), 73 deletions(-) diff --git a/Puppetfile b/Puppetfile index d21252468..b8f1a1acd 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/yoga' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/yoga' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/yoga' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,131 +19,131 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/yoga' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/yoga' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/yoga' mod 'ec2api', :git => 'https://opendev.org/openstack/puppet-ec2api', - :ref => 'master' + :ref => 'stable/yoga' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/yoga' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/yoga' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/yoga' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/yoga' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/yoga' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/yoga' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/yoga' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/yoga' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/yoga' mod 'murano', :git => 'https://opendev.org/openstack/puppet-murano', - :ref => 'master' + :ref => 'stable/yoga' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/yoga' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/yoga' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/yoga' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/yoga' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/yoga' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/yoga' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/yoga' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/yoga' mod 'qdr', :git => 'https://opendev.org/openstack/puppet-qdr', - :ref => 'master' + :ref => 'stable/yoga' mod 'sahara', :git => 'https://opendev.org/openstack/puppet-sahara', - :ref => 'master' + :ref => 'stable/yoga' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/yoga' mod 'tacker', :git => 'https://opendev.org/openstack/puppet-tacker', - :ref => 'master' + :ref => 'stable/yoga' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/yoga' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/yoga' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/yoga' mod 'vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'master' + :ref => 'stable/yoga' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/yoga' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/yoga' ## External modules mod 'powerdns', diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 4f30a06bf..c01b44c1c 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -4,47 +4,85 @@ abstract: true parent: puppet-openstack-base required-projects: - - openstack/openstack - - openstack/puppet-aodh - - openstack/puppet-barbican - - openstack/puppet-ceilometer + - name: openstack/openstack + override-checkout: stable/yoga + - name: openstack/puppet-aodh + override-checkout: stable/yoga + - name: openstack/puppet-barbican + override-checkout: stable/yoga + - name: openstack/puppet-ceilometer + override-checkout: stable/yoga - openstack/puppet-ceph - - openstack/puppet-cinder - - openstack/puppet-cloudkitty - - openstack/puppet-designate - - openstack/puppet-ec2api - - openstack/puppet-glance - - openstack/puppet-gnocchi - - openstack/puppet-heat - - openstack/puppet-horizon - - openstack/puppet-ironic - - openstack/puppet-keystone - - openstack/puppet-magnum - - openstack/puppet-manila - - openstack/puppet-mistral + - name: openstack/puppet-cinder + override-checkout: stable/yoga + - name: openstack/puppet-cloudkitty + override-checkout: stable/yoga + - name: openstack/puppet-designate + override-checkout: stable/yoga + - name: openstack/puppet-ec2api + override-checkout: stable/yoga + - name: openstack/puppet-glance + override-checkout: stable/yoga + - name: openstack/puppet-gnocchi + override-checkout: stable/yoga + - name: openstack/puppet-heat + override-checkout: stable/yoga + - name: openstack/puppet-horizon + override-checkout: stable/yoga + - name: openstack/puppet-ironic + override-checkout: stable/yoga + - name: openstack/puppet-keystone + override-checkout: stable/yoga + - name: openstack/puppet-magnum + override-checkout: stable/yoga + - name: openstack/puppet-manila + override-checkout: stable/yoga + - name: openstack/puppet-mistral + override-checkout: stable/yoga - x/puppet-modulesync-configs - - openstack/puppet-murano - - openstack/puppet-neutron - - openstack/puppet-nova - - openstack/puppet-octavia + - name: openstack/puppet-murano + override-checkout: stable/yoga + - name: openstack/puppet-neutron + override-checkout: stable/yoga + - name: openstack/puppet-nova + override-checkout: stable/yoga + - name: openstack/puppet-octavia + override-checkout: stable/yoga - openstack/puppet-openstack-cookiecutter - - openstack/puppet-openstack-integration - - openstack/puppet-openstack_extras - - openstack/puppet-openstack_spec_helper - - openstack/puppet-openstacklib - - openstack/puppet-oslo - - openstack/puppet-ovn - - openstack/puppet-placement - - openstack/puppet-qdr - - openstack/puppet-sahara - - openstack/puppet-swift - - openstack/puppet-tacker - - openstack/puppet-tempest - - openstack/puppet-trove - - openstack/puppet-vswitch - - openstack/puppet-vitrage - - openstack/puppet-watcher - - openstack/puppet-zaqar + - name: openstack/puppet-openstack-integration + override-checkout: stable/yoga + - name: openstack/puppet-openstack_extras + override-checkout: stable/yoga + - name: openstack/puppet-openstack_spec_helper + override-checkout: stable/yoga + - name: openstack/puppet-openstacklib + override-checkout: stable/yoga + - name: openstack/puppet-oslo + override-checkout: stable/yoga + - name: openstack/puppet-ovn + override-checkout: stable/yoga + - name: openstack/puppet-placement + override-checkout: stable/yoga + - name: openstack/puppet-qdr + override-checkout: stable/yoga + - name: openstack/puppet-sahara + override-checkout: stable/yoga + - name: openstack/puppet-swift + override-checkout: stable/yoga + - name: openstack/puppet-tacker + override-checkout: stable/yoga + - name: openstack/puppet-tempest + override-checkout: stable/yoga + - name: openstack/puppet-trove + override-checkout: stable/yoga + - name: openstack/puppet-vswitch + override-checkout: stable/yoga + - name: openstack/puppet-vitrage + override-checkout: stable/yoga + - name: openstack/puppet-watcher + override-checkout: stable/yoga + - name: openstack/puppet-zaqar + override-checkout: stable/yoga - openstack/tempest - openstack/neutron-tempest-plugin