Merge "Test upgrade from Gerrit 3.3 to 3.4"

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"
@@ -33,7 +33,7 @@
 - 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
 
 - hosts: "review:!disabled"

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:

zuul.d/system-config-run.yaml

@@ -929,15 +929,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