From 66046ccf1af2bc5aa7e36ebf818e861076a70255 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 21 Apr 2025 11:23:44 -0700 Subject: [PATCH] Fix gerrit upgrade testing We had been testing the gerrit upgrade from 3.9 to 3.11. Now that we are running 3.10 we really should test the 3.10 to 3.11 upgrade. Fix that. While we are at it catch the default test gerrit version up to 3.10 as well (it was 3.8 but I don't think we use the default anywhere so this is mostly a noop). Change-Id: Idafbddf3b9af54b45e6b7e06fda1ede6aa0a995e --- .../zuul/templates/host_vars/review99.opendev.org.yaml.j2 | 2 +- playbooks/zuul/upgrade-review.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 68dfd1b67f..80b36efe77 100644 --- a/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 @@ -200,7 +200,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.8') }}" +gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.10') }}" gerrit_under_test: true gerrit_launchpad_auth: access_token: 'token' diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml index 090c939620..1f49cd94e7 100644 --- a/playbooks/zuul/upgrade-review.yaml +++ b/playbooks/zuul/upgrade-review.yaml @@ -7,7 +7,7 @@ - name: Ensure initial gerrit state without starting Gerrit import_playbook: ../service-review.yaml vars: - gerrit_container_image: docker.io/opendevorg/gerrit:3.9 + gerrit_container_image: docker.io/opendevorg/gerrit:3.10 gerrit_run_init: false gerrit_run_reindex: false gerrit_run_compose_up: false @@ -35,7 +35,7 @@ - name: Start Gerrit on the old version of Gerrit import_playbook: ../service-review.yaml vars: - gerrit_container_image: docker.io/opendevorg/gerrit:3.9 + gerrit_container_image: docker.io/opendevorg/gerrit:3.10 - hosts: "review:!disabled" name: "Wait for gerrit to be up and running"