From 0f6c29c0ee17530c2ec85e0d982d964ab6a745db Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 7 Oct 2021 11:57:04 -0700
Subject: [PATCH] Test upgrade from Gerrit 3.3 to 3.4

This shifts our Gerrit upgrade testing ahead to testing 3.3 to 3.4
upgrades as we have upgraded to 3.3 at this point.

Change-Id: Ibb45113dd50f294a2692c65f19f63f83c96a3c11
---
 playbooks/zuul/upgrade-review.yaml | 4 ++--
 zuul.d/project.yaml                | 4 ++--
 zuul.d/system-config-run.yaml      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml
index 888c2ab34a..ee269bddc8 100644
--- a/playbooks/zuul/upgrade-review.yaml
+++ b/playbooks/zuul/upgrade-review.yaml
@@ -1,7 +1,7 @@
 - name: Ensure initial gerrit state
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.2
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.3
 
 - hosts: "review:!disabled"
   name: "Prepare Gerrit for Upgrade"
@@ -18,5 +18,5 @@
 - name: Perform gerrit upgrade
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.3
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.4
     gerrit_run_init: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 569717dd68..6ea4d3d635 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -79,10 +79,10 @@
         - system-config-upgrade-review:
             dependencies:
               - name: opendev-buildset-registry
-              - name: system-config-build-image-gerrit-3.2
-                soft: true
               - name: system-config-build-image-gerrit-3.3
                 soft: true
+              - name: system-config-build-image-gerrit-3.4
+                soft: true
         - system-config-build-image-refstack
         - system-config-run-refstack:
             dependencies:
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 520328a236..a0d53d70ba 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -918,15 +918,15 @@
     name: system-config-upgrade-review
     parent: system-config-run-review-base
     description: |
-      Test we can upgrade a gerrit 3.2 to 3.3
+      Test we can upgrade a gerrit 3.3 to 3.4
     requires:
-      - gerrit-3.2-container-image
       - gerrit-3.3-container-image
+      - gerrit-3.4-container-image
     vars:
       run_playbooks:
         - playbooks/letsencrypt.yaml
         - playbooks/zuul/upgrade-review.yaml
-      zuul_test_gerrit_version: '3.2'
+      zuul_test_gerrit_version: '3.3'
 
 - job:
     name: system-config-run-static