Revert "Switch to stable/wallaby"

This reverts commit 47d6b412b6.

Reason for revert: The commit was made in a wrong branch.

Change-Id: Ib729db4ab45f398b6190ab826eb1dfd14e762039

Puppetfile

@@ -3,15 +3,15 @@
 ## OpenStack modules
 mod 'aodh',
   :git => 'https://opendev.org/openstack/puppet-aodh',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'barbican',
   :git => 'https://opendev.org/openstack/puppet-barbican',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'ceilometer',
   :git => 'https://opendev.org/openstack/puppet-ceilometer',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'ceph',
   :git => 'https://opendev.org/openstack/puppet-ceph',
@@ -19,139 +19,139 @@ mod 'ceph',
 
 mod 'cinder',
   :git => 'https://opendev.org/openstack/puppet-cinder',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'cloudkitty',
   :git => 'https://opendev.org/openstack/puppet-cloudkitty',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'designate',
   :git => 'https://opendev.org/openstack/puppet-designate',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'ec2api',
   :git => 'https://opendev.org/openstack/puppet-ec2api',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'glance',
   :git => 'https://opendev.org/openstack/puppet-glance',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'gnocchi',
   :git => 'https://opendev.org/openstack/puppet-gnocchi',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'heat',
   :git => 'https://opendev.org/openstack/puppet-heat',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'horizon',
   :git => 'https://opendev.org/openstack/puppet-horizon',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'ironic',
   :git => 'https://opendev.org/openstack/puppet-ironic',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'keystone',
   :git => 'https://opendev.org/openstack/puppet-keystone',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'magnum',
   :git => 'https://opendev.org/openstack/puppet-magnum',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'manila',
   :git => 'https://opendev.org/openstack/puppet-manila',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'mistral',
   :git => 'https://opendev.org/openstack/puppet-mistral',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'monasca',
   :git => 'https://opendev.org/openstack/puppet-monasca',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'murano',
   :git => 'https://opendev.org/openstack/puppet-murano',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'neutron',
   :git => 'https://opendev.org/openstack/puppet-neutron',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'nova',
   :git => 'https://opendev.org/openstack/puppet-nova',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'octavia',
   :git => 'https://opendev.org/openstack/puppet-octavia',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'openstack_extras',
   :git => 'https://opendev.org/openstack/puppet-openstack_extras',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'openstacklib',
   :git => 'https://opendev.org/openstack/puppet-openstacklib',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'oslo',
   :git => 'https://opendev.org/openstack/puppet-oslo',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'ovn',
   :git => 'https://opendev.org/openstack/puppet-ovn',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'panko',
   :git => 'https://opendev.org/openstack/puppet-panko',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'placement',
   :git => 'https://opendev.org/openstack/puppet-placement',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'qdr',
   :git => 'https://opendev.org/openstack/puppet-qdr',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'sahara',
   :git => 'https://opendev.org/openstack/puppet-sahara',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'swift',
   :git => 'https://opendev.org/openstack/puppet-swift',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'tacker',
   :git => 'https://opendev.org/openstack/puppet-tacker',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'tempest',
   :git => 'https://opendev.org/openstack/puppet-tempest',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'trove',
   :git => 'https://opendev.org/openstack/puppet-trove',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'vswitch',
   :git => 'https://opendev.org/openstack/puppet-vswitch',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'vitrage',
   :git => 'https://opendev.org/openstack/puppet-vitrage',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'watcher',
   :git => 'https://opendev.org/openstack/puppet-watcher',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 mod 'zaqar',
   :git => 'https://opendev.org/openstack/puppet-zaqar',
-  :ref => 'stable/wallaby'
+  :ref => 'master'
 
 ## External modules
 mod 'powerdns',

run_tests.sh

@@ -325,7 +325,6 @@ if uses_debs; then
   $SUDO apt install -y python3-pip
   git clone https://opendev.org/openstack/neutron-tempest-plugin /tmp/openstack/neutron-tempest-plugin
   pushd /tmp/openstack/neutron-tempest-plugin
-  git reset --hard 1.4.0
   $SUDO pip3 install .
   popd
 else

zuul.d/base.yaml

@@ -5,90 +5,49 @@
     parent: puppet-openstack-base
     required-projects:
       - openstack/openstack
-      - name: openstack/puppet-aodh
+      - openstack/puppet-aodh
-        override-checkout: stable/wallaby
+      - openstack/puppet-barbican
-      - name: openstack/puppet-barbican
+      - openstack/puppet-ceilometer
-        override-checkout: stable/wallaby
+      - openstack/puppet-ceph
-      - name: openstack/puppet-ceilometer
+      - openstack/puppet-cinder
-        override-checkout: stable/wallaby
+      - openstack/puppet-cloudkitty
-      - name: openstack/puppet-ceph
+      - openstack/puppet-designate
-      - name: openstack/puppet-cinder
+      - openstack/puppet-ec2api
-        override-checkout: stable/wallaby
+      - openstack/puppet-glance
-      - name: openstack/puppet-cloudkitty
+      - openstack/puppet-gnocchi
-        override-checkout: stable/wallaby
+      - openstack/puppet-heat
-      - name: openstack/puppet-designate
+      - openstack/puppet-horizon
-        override-checkout: stable/wallaby
+      - openstack/puppet-ironic
-      - name: openstack/puppet-ec2api
+      - openstack/puppet-keystone
-        override-checkout: stable/wallaby
+      - openstack/puppet-magnum
-      - name: openstack/puppet-glance
+      - openstack/puppet-manila
-        override-checkout: stable/wallaby
+      - openstack/puppet-mistral
-      - name: openstack/puppet-gnocchi
+      - openstack/puppet-monasca
-        override-checkout: stable/wallaby
+      - x/puppet-modulesync-configs
-      - name: openstack/puppet-heat
+      - openstack/puppet-murano
-        override-checkout: stable/wallaby
+      - openstack/puppet-neutron
-      - name: openstack/puppet-horizon
+      - openstack/puppet-nova
-        override-checkout: stable/wallaby
+      - openstack/puppet-octavia
-      - name: openstack/puppet-ironic
+      - openstack/puppet-openstack-cookiecutter
-        override-checkout: stable/wallaby
+      - openstack/puppet-openstack-integration
-      - name: openstack/puppet-keystone
+      - openstack/puppet-openstack_extras
-        override-checkout: stable/wallaby
+      - openstack/puppet-openstack_spec_helper
-      - name: openstack/puppet-magnum
+      - openstack/puppet-openstacklib
-        override-checkout: stable/wallaby
+      - openstack/puppet-oslo
-      - name: openstack/puppet-manila
+      - openstack/puppet-ovn
-        override-checkout: stable/wallaby
+      - openstack/puppet-panko
-      - name: openstack/puppet-mistral
+      - openstack/puppet-placement
-        override-checkout: stable/wallaby
+      - openstack/puppet-qdr
-      - name: openstack/puppet-monasca
+      - openstack/puppet-sahara
-        override-checkout: stable/wallaby
+      - openstack/puppet-swift
-      - name: x/puppet-modulesync-configs
+      - openstack/puppet-tacker
-        override-checkout: stable/wallaby
+      - openstack/puppet-tempest
-      - name: openstack/puppet-murano
+      - openstack/puppet-trove
-        override-checkout: stable/wallaby
+      - openstack/puppet-vswitch
-      - name: openstack/puppet-neutron
+      - openstack/puppet-vitrage
-        override-checkout: stable/wallaby
+      - openstack/puppet-watcher
-      - name: openstack/puppet-nova
+      - openstack/puppet-zaqar
-        override-checkout: stable/wallaby
+      - openstack/tempest
-      - name: openstack/puppet-octavia
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-openstack-cookiecutter
-      - name: openstack/puppet-openstack-integration
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-openstack_extras
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-openstack_spec_helper
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-openstacklib
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-oslo
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-ovn
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-panko
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-placement
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-qdr
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-sahara
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-swift
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-tacker
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-tempest
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-trove
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-vswitch
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-vitrage
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-watcher
-        override-checkout: stable/wallaby
-      - name: openstack/puppet-zaqar
-        override-checkout: stable/wallaby
-      - name: openstack/tempest
-        override-checkout: 27.0.0
 
 - job:
     name: puppet-openstack-integration-run-base