Merge "Run gerrit 3.2 and 3.3 functional tests"

playbooks/zuul/templates/group_vars/review.yaml.j2

@@ -91,3 +91,4 @@ gerrit_run_init_dev_mode: true
 gerrit_storyboard_token: 52514e74-4b8f-4d6d-a29a-a6262f97578a
 gerrit_email_private_key: wjpkxebohgbid6rpuwpfrYsouxpgseluqir6yupppBczoezj
 gerrit_rest_token_private_key: A83fAC8x72wxcu
+gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.2') }}"

zuul.d/project.yaml

@@ -55,11 +55,16 @@
               - name: system-config-build-image-grafana
                 soft: true
         - system-config-run-graphite
-        - system-config-run-review:
+        - system-config-run-review-3.2:
             dependencies:
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.2
                 soft: true
+        - system-config-run-review-3.3:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.3
+                soft: true
         - system-config-build-image-refstack
         - system-config-run-refstack:
             dependencies:
@@ -155,11 +160,16 @@
               - name: system-config-upload-image-grafana
                 soft: true
         - system-config-run-graphite
-        - system-config-run-review:
+        - system-config-run-review-3.2:
             dependencies:
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-3.2
                 soft: true
+        - system-config-run-review-3.3:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-3.3
+                soft: true
         - system-config-run-refstack:
             dependencies:
               - name: system-config-build-image-refstack

zuul.d/system-config-run.yaml

@@ -823,11 +823,10 @@
       - testinfra/util.py
 
 - job:
-    name: system-config-run-review
+    name: system-config-run-review-base
     parent: system-config-run-containers
     description: |
-      Run the playbook for gerrit (in a container).
+      Base job for testing gerrit
-    requires: gerrit-3.2-container-image
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -867,6 +866,24 @@
       - testinfra/test_gerrit.py
       - docker/gerrit/
 
+- job:
+    name: system-config-run-review-3.2
+    parent: system-config-run-review-base
+    description: |
+      Run the playbook for gerrit 3.2 (in a container).
+    requires: gerrit-3.2-container-image
+    vars:
+      zuul_test_gerrit_version: '3.2'
+
+- job:
+    name: system-config-run-review-3.3
+    parent: system-config-run-review-base
+    description: |
+      Run the playbook for gerrit 3.3 (in a container).
+    requires: gerrit-3.3-container-image
+    vars:
+      zuul_test_gerrit_version: '3.3'
+
 - job:
     name: system-config-run-static
     parent: system-config-run