From 91a12dd781ff7515ac59ef584bea2482f46fa6aa Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 10 Dec 2024 08:20:39 -0800
Subject: [PATCH] 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 |  4 ++--
 zuul.d/project.yaml                | 15 +++++++--------
 zuul.d/system-config-run.yaml      | 29 ++++++++++++++---------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml
index 85dbd43828..090c939620 100644
--- a/playbooks/zuul/upgrade-review.yaml
+++ b/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"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index a92b54fa85..414cb6041c 100644
--- a/zuul.d/project.yaml
+++ b/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:
-        #    dependencies:
-        #      - name: opendev-buildset-registry
-        #      - name: system-config-build-image-gerrit-3.9
-        #        soft: true
-        #      - name: system-config-build-image-gerrit-3.10
-        #        soft: true
+        - system-config-upgrade-review:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.10
+                soft: true
+              - name: system-config-build-image-gerrit-3.11
+                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 eece6f7647..07cc73c07e 100644
--- a/zuul.d/system-config-run.yaml
+++ b/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:
-#    name: system-config-upgrade-review
-#    parent: system-config-run-review-base
-#    description: |
-#      Test we can upgrade a gerrit 3.9 to 3.10
-#    requires:
-#      - gerrit-3.9-container-image
-#      - gerrit-3.10-container-image
-#    vars:
-#      run_playbooks:
-#        - playbooks/letsencrypt.yaml
-#        - playbooks/zuul/upgrade-review.yaml
-#      run_test_playbook: playbooks/zuul/test-review.yaml
-#      zuul_test_gerrit_version: '3.9'
+- job:
+    name: system-config-upgrade-review
+    parent: system-config-run-review-base
+    description: |
+      Test we can upgrade a gerrit 3.10 to 3.11
+    requires:
+      - gerrit-3.10-container-image
+      - gerrit-3.11-container-image
+    vars:
+      run_playbooks:
+        - playbooks/letsencrypt.yaml
+        - playbooks/zuul/upgrade-review.yaml
+      run_test_playbook: playbooks/zuul/test-review.yaml
+      zuul_test_gerrit_version: '3.10'
 
 - job:
     name: system-config-run-static