Update zuul config to not use the deprecated queue syntax

This is regards to the following email [1] which also references [2] with the
actual fix.

In addition, disable auto discovery as a workaround in setup.py [3]

Also fix issues with doc builds and Chef gem installations.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html
[2] https://lists.zuul-ci.org/pipermail/zuul-discuss/2022-May/001801.html
[3] https://review.opendev.org/c/openstack/tripleo-quickstart/+/835192

Change-Id: I93b97525172f26a25e189661fc31ecd80b88395b
Signed-off-by: Lance Albertson <lance@osuosl.org>
(cherry picked from commit d3f608128c)
(cherry picked from commit 0fa037fff1)
This commit is contained in:
Lance Albertson 2022-05-19 13:54:14 -07:00
parent 11298a65e9
commit e2b6b7d79a
4 changed files with 10 additions and 4 deletions

View File

@ -31,13 +31,13 @@
- project-template:
name: openstack-chef-jobs
queue: openstack-chef
check:
jobs:
- openstack-chef-delivery
- openstack-chef-integration-ubuntu
- openstack-chef-integration-centos
gate:
queue: openstack-chef
jobs:
- openstack-chef-delivery
- openstack-chef-integration-ubuntu

View File

@ -5,5 +5,5 @@
# this is required for the docs build jobs
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme==1.18.1 # Apache-2.0
openstackdocstheme==3.1.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0

View File

@ -12,8 +12,13 @@
chdir: /home/zuul/src/opendev.org/openstack/openstack-chef/
become: yes
- name: Install berkshelf
shell: /opt/chef/embedded/bin/gem install --no-rdoc --no-ri berkshelf
shell: |
/opt/chef/embedded/bin/gem install --no-rdoc --no-ri faraday-net_http -v 2.1.0
/opt/chef/embedded/bin/gem install --no-rdoc --no-ri faraday -v 1.10.3
/opt/chef/embedded/bin/gem install --no-rdoc --no-ri berkshelf -v 7.0.10
become: yes
- name: Install cookstyle
shell: /opt/chef/embedded/bin/gem install --no-rdoc --no-ri cookstyle
shell: |
/opt/chef/embedded/bin/gem install --no-rdoc --no-ri rubocop-ast -v 1.17.0
/opt/chef/embedded/bin/gem install --no-rdoc --no-ri cookstyle -v 7.32.1
become: yes

View File

@ -26,5 +26,6 @@ except ImportError:
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
py_modules=[],
pbr=True)