From c17fe1155aeb47f4d3abff11498c4c9f22c0e30a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 20 Nov 2023 08:07:39 -0800 Subject: [PATCH] Switch gerrit 3.7 image to 3.8 in a couple places we missed One spot is a default for testing that I'm pretty sure we override everywhere anyway and the other is the resource requirement for the infra-prod deployment job. Neither are critical, but good to have both up to date after our upgrade. Change-Id: If74ec2707cfadff1772596891e5a2783e83eb01b --- .../zuul/templates/host_vars/review99.opendev.org.yaml.j2 | 2 +- zuul.d/project.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 index 6187ccfee8..b9928e2311 100644 --- a/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 @@ -97,7 +97,7 @@ gerrit_run_init_dev_mode: true gerrit_storyboard_token: 52514e74-4b8f-4d6d-a29a-a6262f97578a gerrit_email_private_key: wjpkxebohgbid6rpuwpfrYsouxpgseluqir6yupppBczoezj gerrit_rest_token_private_key: A83fAC8x72wxcu -gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.7') }}" +gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.8') }}" gerrit_under_test: true gerrit_launchpad_auth: access_token: 'token' diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 179fad6152..d4182cc413 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -533,7 +533,7 @@ soft: true - name: infra-prod-letsencrypt soft: true - - name: system-config-promote-image-gerrit-3.7 + - name: system-config-promote-image-gerrit-3.8 soft: true - infra-prod-service-tracing: &infra-prod-service-tracing dependencies: @@ -587,7 +587,7 @@ soft: true - name: infra-prod-service-gitea soft: true - - name: system-config-promote-image-gerrit-3.7 + - name: system-config-promote-image-gerrit-3.8 soft: true # Note that this job also runs from project-config, so we # match system-config specific files here rather than the