From ca97f1e0d65ae880c387cb656c5d7a250fce92ab Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 20 Nov 2023 08:22:31 -0800
Subject: [PATCH] Add gerrit 3.8 to 3.9 upgrade testing

The Gerrit 3.9 release notes [0] indicate this is a very similar upgrade
to the previous 3.7 to 3.8 upgrade. Specifically we only need to run
init and online reindexing will occur on startup of the new version.
For this reason not much changes other than version numbers.

[0] https://www.gerritcodereview.com/3.9.html

Change-Id: I11f7b3d5e0c545d9b78fb656ea1f09fe57b5994e
---
 playbooks/zuul/upgrade-review.yaml |  8 ++++----
 zuul.d/project.yaml                | 14 +++++++-------
 zuul.d/system-config-run.yaml      | 28 ++++++++++++++--------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml
index 763079d142..ff7d613e28 100644
--- a/playbooks/zuul/upgrade-review.yaml
+++ b/playbooks/zuul/upgrade-review.yaml
@@ -7,7 +7,7 @@
 - name: Ensure initial gerrit state without starting Gerrit
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.7
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.8
     gerrit_run_init: false
     gerrit_run_reindex: false
     gerrit_run_compose_up: false
@@ -35,7 +35,7 @@
 - name: Start Gerrit on the old version of Gerrit
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.7
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.8
 
 - hosts: "review:!disabled"
   name: "Wait for gerrit to be up and running"
@@ -84,9 +84,9 @@
 - name: Perform gerrit upgrade
   import_playbook: ../service-review.yaml
   vars:
-    gerrit_container_image: docker.io/opendevorg/gerrit:3.8
+    gerrit_container_image: docker.io/opendevorg/gerrit:3.9
     gerrit_run_init: true
-    # Gerrit 3.7 -> 3.8 upgrade does not require an offline reindex
+    # Gerrit 3.8 -> 3.9 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 0bdc806050..57ddf946ad 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -74,13 +74,13 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.9
                 soft: true
-        #- system-config-upgrade-review:
-        #    dependencies:
-        #      - name: opendev-buildset-registry
-        #      - name: system-config-build-image-gerrit-3.7
-        #        soft: true
-        #      - name: system-config-build-image-gerrit-3.8
-        #        soft: true
+        - system-config-upgrade-review:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.8
+                soft: true
+              - name: system-config-build-image-gerrit-3.9
+                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 ce0a600d61..a71e7cb64e 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -1093,20 +1093,20 @@
     vars:
       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.7 to 3.8
-#    requires:
-#      - gerrit-3.7-container-image
-#      - gerrit-3.8-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.7'
+- job:
+    name: system-config-upgrade-review
+    parent: system-config-run-review-base
+    description: |
+      Test we can upgrade a gerrit 3.8 to 3.9
+    requires:
+      - gerrit-3.8-container-image
+      - gerrit-3.9-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.8'
 
 - job:
     name: system-config-run-static