Run gerrit 3.2 and 3.3 functional tests

This change splits our existing system-config-run-review job into two
jobs, one for gerrit 3.2 and another for 3.3. The biggest change is that
we use a var called zuul_test_gerrit_version to select which version we
want and that ends up in the fake group file written out by Zuul for the
nested ansible run. The nested ansible run will then populate the
docker-compose file with the appropriate version for us.

Change-Id: I00b52c0f4aa8df3ecface964007fcf5724887e5e

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

@@ -822,11 +822,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).
-    requires: gerrit-3.2-container-image
+      Base job for testing gerrit
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -866,6 +865,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