From e47dccdc34ab9fb20bcdcc0ddc16979293ede41a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 7 Oct 2021 11:37:28 -0700
Subject: [PATCH] Upgrade Gerrit to 3.3

This bumps the gerrit image up to our 3.3 image. Followup changes will
shift upgrade testing to test 3.3 to 3.4 upgrades, clean up no longer
needed 3.2 images, and start building 3.4 images.

Change-Id: Id0f544846946d4c50737a54ceb909a0a686a594e
---
 playbooks/roles/gerrit/defaults/main.yaml          | 2 +-
 playbooks/zuul/templates/group_vars/review.yaml.j2 | 2 +-
 zuul.d/infra-prod.yaml                             | 2 +-
 zuul.d/project.yaml                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml
index 2cb2585ef3..79943cd4a8 100644
--- a/playbooks/roles/gerrit/defaults/main.yaml
+++ b/playbooks/roles/gerrit/defaults/main.yaml
@@ -6,7 +6,7 @@ gerrit_run_compose_up: false
 gerrit_run_init: false
 gerrit_run_init_dev_mode: false
 gerrit_packed_git_open_files: 4096
-gerrit_container_image: docker.io/opendevorg/gerrit:3.2
+gerrit_container_image: docker.io/opendevorg/gerrit:3.3
 gerrit_container_volumes:
   - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib
   - /home/gerrit2/.ssh:/var/gerrit/.ssh
diff --git a/playbooks/zuul/templates/group_vars/review.yaml.j2 b/playbooks/zuul/templates/group_vars/review.yaml.j2
index 22a4e76ed3..f652021709 100644
--- a/playbooks/zuul/templates/group_vars/review.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/review.yaml.j2
@@ -96,7 +96,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.2') }}"
+gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.3') }}"
 gerrit_under_test: true
 gerrit_launchpad_auth:
   access_token: 'token'
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index bbc805086e..80f6e0d279 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -391,7 +391,7 @@
         soft: true
       - name: infra-prod-letsencrypt
         soft: true
-      - name: system-config-promote-image-gerrit-3.2
+      - name: system-config-promote-image-gerrit-3.3
         soft: true
     files:
       - inventory/base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4c19ae6c3e..8bf8d27890 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -362,7 +362,7 @@
               - playbooks/roles/gerrit/defaults/main.yaml
               - playbooks/roles/gerrit/tasks/manage-projects.yaml
             dependencies:
-              - name: system-config-promote-image-gerrit-3.2
+              - name: system-config-promote-image-gerrit-3.3
                 soft: true
               - name: infra-prod-install-ansible
                 soft: true