From 2d6a94c8e80946dae2441eef77667dcbabbfe058 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Wed, 3 Jul 2024 16:59:36 +0700 Subject: [PATCH] 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 --- .zuul.yaml | 39 ++++++++++++++++++--------------------- docker/Dockerfile | 12 ++++++------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a77fd5d..e19ebbb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -7,35 +7,32 @@ voting: false - monasca-tempest-java-influxdb: voting: false - - monasca-tempest-java-cassandra: - voting: false - legacy-monasca-thresh-maven-build - - build-monasca-docker-image +# - build-monasca-docker-image gate: jobs: - legacy-monasca-thresh-maven-build post: jobs: - legacy-monasca-thresh-localrepo-upload - - publish-monasca-thresh-docker-image - periodic: - jobs: - - publish-monasca-thresh-docker-image - release: - jobs: - - publish-monasca-thresh-docker-image +# - publish-monasca-thresh-docker-image +# periodic: +# jobs: +# - publish-monasca-thresh-docker-image +# release: +# jobs: +# - publish-monasca-thresh-docker-image - -- job: - name: publish-monasca-thresh-docker-image - parent: build-monasca-docker-image - post-run: playbooks/docker-publish.yml - required-projects: - - openstack/monasca-common - vars: - publisher: true - secrets: - - docker_hub_login_thresh +# - job: +# name: publish-monasca-thresh-docker-image +# parent: build-monasca-docker-image +# post-run: playbooks/docker-publish.yml +# required-projects: +# - openstack/monasca-common +# vars: +# publisher: true +# secrets: +# - docker_hub_login_thresh - secret: name: docker_hub_login_thresh diff --git a/docker/Dockerfile b/docker/Dockerfile index 1596a7d..c3e0bb8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,13 +66,13 @@ RUN \ mkdir -p /usr/share/man/man1 && \ apt-get clean && \ 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://security.debian.org/debian-security stretch/updates main' && \ - apt-get update && \ - apt-get install -y --no-install-recommends openjdk-8-jdk -o APT::Immediate-Configure=0 && \ - apt-get install -y --no-install-recommends maven git python3-pip && \ - apt-get install -y --no-install-recommends python3 default-mysql-client && \ + apt-add-repository -y 'deb http://archive.debian.org/debian-security stretch/updates main' && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends openjdk-8-jdk && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends maven git python3-pip && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y -o APT::Immediate-Configure=0 --no-install-recommends python3 default-mysql-client && \ mkdir /root/.m2 && \ pip3 install --no-cache-dir --upgrade setuptools && \ pip3 install --no-cache-dir \