Reenable Gerrit upgrade job now testing 3.10 to 3.11

The 3.10 to 3.11 upgrade does need an offline init but no offline
reindex. This matches the 3.9 to 3.10 upgrade process so updates to the
job are minimal.

Change-Id: I161f0d28614e3222bb7136e0cf2490faa97533a2

playbooks/zuul/upgrade-review.yaml

@@ -84,9 +84,9 @@
 - name: Perform gerrit upgrade
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.10
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.11
     gerrit_run_init: true
-    # Gerrit 3.9 -> 3.10 upgrade does not require an offline reindex
+    # Gerrit 3.10 -> 3.11 upgrade does not require an offline reindex
     gerrit_run_reindex: false
 
 - hosts: "review:!disabled"

zuul.d/project.yaml

@@ -72,14 +72,13 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.11
                 soft: true
-        # Disabled until we can test the 3.10 -> 3.11 upgrade
+        - system-config-upgrade-review:
-        #- system-config-upgrade-review:
+            dependencies:
-        #    dependencies:
+              - name: opendev-buildset-registry
-        #      - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.10
-        #      - name: system-config-build-image-gerrit-3.9
+                soft: true
-        #        soft: true
+              - name: system-config-build-image-gerrit-3.11
-        #      - name: system-config-build-image-gerrit-3.10
+                soft: true
-        #        soft: true
         - system-config-build-image-refstack
         - system-config-run-refstack:
             dependencies:

zuul.d/system-config-run.yaml

@@ -1112,21 +1112,20 @@
     vars:
       zuul_test_gerrit_version: '3.11'
 
-# Disabled until we can test the 3.10 to 3.11 upgrade
+- job:
-#- job:
+    name: system-config-upgrade-review
-#    name: system-config-upgrade-review
+    parent: system-config-run-review-base
-#    parent: system-config-run-review-base
+    description: |
-#    description: |
+      Test we can upgrade a gerrit 3.10 to 3.11
-#      Test we can upgrade a gerrit 3.9 to 3.10
+    requires:
-#    requires:
+      - gerrit-3.10-container-image
-#      - gerrit-3.9-container-image
+      - gerrit-3.11-container-image
-#      - gerrit-3.10-container-image
+    vars:
-#    vars:
+      run_playbooks:
-#      run_playbooks:
+        - playbooks/letsencrypt.yaml
-#        - playbooks/letsencrypt.yaml
+        - playbooks/zuul/upgrade-review.yaml
-#        - playbooks/zuul/upgrade-review.yaml
+      run_test_playbook: playbooks/zuul/test-review.yaml
-#      run_test_playbook: playbooks/zuul/test-review.yaml
+      zuul_test_gerrit_version: '3.10'
-#      zuul_test_gerrit_version: '3.9'
 
 - job:
     name: system-config-run-static