Fix deprecated zuul queue syntax

Zuul deprecated (and now removed) declaring shared queues at a pipeline
level [1]. This patch fixes the syntax to make the gate work again for
monasca-common.

[1] https://lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html
[2] https://review.opendev.org/c/openstack/monasca-common/+/874297

Change-Id: I0e591770e30c321bcc340b9dd13303259462f30a
This commit is contained in:
Hoai-Thu Vuong 2024-07-03 16:59:36 +07:00
parent d256f05be6
commit 2d6a94c8e8
2 changed files with 24 additions and 27 deletions

View File

@ -7,35 +7,32 @@
voting: false voting: false
- monasca-tempest-java-influxdb: - monasca-tempest-java-influxdb:
voting: false voting: false
- monasca-tempest-java-cassandra:
voting: false
- legacy-monasca-thresh-maven-build - legacy-monasca-thresh-maven-build
- build-monasca-docker-image # - build-monasca-docker-image
gate: gate:
jobs: jobs:
- legacy-monasca-thresh-maven-build - legacy-monasca-thresh-maven-build
post: post:
jobs: jobs:
- legacy-monasca-thresh-localrepo-upload - legacy-monasca-thresh-localrepo-upload
- publish-monasca-thresh-docker-image # - publish-monasca-thresh-docker-image
periodic: # periodic:
jobs: # jobs:
- publish-monasca-thresh-docker-image # - publish-monasca-thresh-docker-image
release: # release:
jobs: # jobs:
- publish-monasca-thresh-docker-image # - publish-monasca-thresh-docker-image
# - job:
- job: # name: publish-monasca-thresh-docker-image
name: publish-monasca-thresh-docker-image # parent: build-monasca-docker-image
parent: build-monasca-docker-image # post-run: playbooks/docker-publish.yml
post-run: playbooks/docker-publish.yml # required-projects:
required-projects: # - openstack/monasca-common
- openstack/monasca-common # vars:
vars: # publisher: true
publisher: true # secrets:
secrets: # - docker_hub_login_thresh
- docker_hub_login_thresh
- secret: - secret:
name: docker_hub_login_thresh name: docker_hub_login_thresh

View File

@ -66,13 +66,13 @@ RUN \
mkdir -p /usr/share/man/man1 && \ mkdir -p /usr/share/man/man1 && \
apt-get clean && \ apt-get clean && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends iproute2 net-tools netcat unzip software-properties-common && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iproute2 net-tools netcat unzip software-properties-common && \
apt-add-repository -y 'deb http://ftp.de.debian.org/debian sid main' && \ apt-add-repository -y 'deb http://ftp.de.debian.org/debian sid main' && \
apt-add-repository -y 'deb http://security.debian.org/debian-security stretch/updates main' && \ apt-add-repository -y 'deb http://archive.debian.org/debian-security stretch/updates main' && \
apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -y --no-install-recommends openjdk-8-jdk -o APT::Immediate-Configure=0 && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends openjdk-8-jdk && \
apt-get install -y --no-install-recommends maven git python3-pip && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends maven git python3-pip && \
apt-get install -y --no-install-recommends python3 default-mysql-client && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends python3 default-mysql-client && \
mkdir /root/.m2 && \ mkdir /root/.m2 && \
pip3 install --no-cache-dir --upgrade setuptools && \ pip3 install --no-cache-dir --upgrade setuptools && \
pip3 install --no-cache-dir \ pip3 install --no-cache-dir \