Use ZooKeeper TLS in tests

This mirrors the configuration in Nodepool for using TLS-enabled
ZooKeeper in tests.  We use the ensure-zookeeper role in order
to get a newer ZooKeeper than is supplied in bionic.

Change-Id: I14413fccbc9a6a7a75b6233d667e2a1d2856d894

1 files changed, 62 insertions, 30 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 711cb69c3..57c69a1a9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,16 +45,70 @@
       zuul_ansible_version: 2.9
 
 - job:
+    name: zuul-tox
+    description: |
+      Zuul unit tests with ZooKeeper running
+    parent: tox
+    nodeset: ubuntu-bionic
+    pre-run: playbooks/zuul-tox/pre.yaml
+    post-run: playbooks/zuul-tox/post-system-logs.yaml
+    vars:
+      tox_environment:
+        ZUUL_ZK_CA: /opt/zookeeper/ca/certs/cacert.pem
+        ZUUL_ZK_CERT: /opt/zookeeper/ca/certs/client.pem
+        ZUUL_ZK_KEY: /opt/zookeeper/ca/keys/clientkey.pem
+        ZUUL_TEST_ROOT: /tmp/zuul-test
+        YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
+      test_setup_environment:
+        ZUUL_TEST_ROOT: /tmp/zuul-test
+        YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
+
+- job:
     name: zuul-tox-remote
     parent: tox
+    timeout: 2700  # 45 minutes
+    pre-run: playbooks/zuul-tox/pre.yaml
+    post-run: playbooks/zuul-tox/post-system-logs.yaml
     vars:
       tox_envlist: remote
       tox_environment:
+        ZUUL_ZK_CA: /opt/zookeeper/ca/certs/cacert.pem
+        ZUUL_ZK_CERT: /opt/zookeeper/ca/certs/client.pem
+        ZUUL_ZK_KEY: /opt/zookeeper/ca/keys/clientkey.pem
         ZUUL_SSH_KEY: /home/zuul/.ssh/id_rsa
         ZUUL_REMOTE_IPV4: "{{ nodepool.interface_ip }}"
         ZUUL_REMOTE_KEEP: "true"
 
 - job:
+    name: zuul-tox-zuul-client
+    parent: zuul-tox
+    description: |
+      Test that Zuul and zuul-client work together.
+    required-projects:
+      - zuul/zuul
+      - zuul/zuul-client
+    vars:
+      zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/zuul'].src_dir }}"
+      tox_envlist: zuul_client
+    nodeset: ubuntu-bionic
+
+- job:
+    name: zuul-tox-py36
+    parent: zuul-tox
+    timeout: 4800  # 80 minutes
+    vars:
+      tox_envlist: py36
+      python_version: 3.6
+
+- job:
+    name: zuul-tox-py38
+    parent: zuul-tox
+    timeout: 4800  # 80 minutes
+    vars:
+      tox_envlist: py38
+      python_version: 3.8
+
+- job:
     name: zuul-build-dashboard
     parent: build-javascript-deployment
     description: |
@@ -223,22 +277,8 @@
         - tox-linters:
             vars:
               tox_install_bindep: false
-        - tox-py36:
-            nodeset: ubuntu-bionic
-            timeout: 4800  # 80 minutes
-            vars: &zuul_tox_vars
-                test_setup_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
-                    YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
-                tox_environment:
-                    ZUUL_TEST_ROOT: /tmp/zuul-test
-                    YARN_REGISTRY: "https://{{ zuul_site_mirror_fqdn }}:4443/registry.npmjs"
-            post-run: playbooks/common/post-system-logs.yaml
-        - tox-py38:
-            timeout: 4800  # 80 minutes
-            nodeset: ubuntu-bionic
-            vars: *zuul_tox_vars
-            post-run: playbooks/common/post-system-logs.yaml
+        - zuul-tox-py36
+        - zuul-tox-py38
         - zuul-build-dashboard-openstack-whitelabel
         - zuul-build-dashboard-software-factory
         - zuul-build-dashboard-opendev
@@ -253,14 +293,13 @@
               - web/.*
         - zuul-stream-functional-2.8
         - zuul-stream-functional-2.9
-        - zuul-tox-remote:
-            timeout: 2700  # 45 minutes
+        - zuul-tox-remote
         - zuul-quick-start:
             requires: nodepool-container-image
             dependencies: zuul-build-image
         - nodepool-zuul-functional:
             voting: false
-        - zuul-client-zuul-functional
+        - zuul-tox-zuul-client
         - zuul-build-python-release
     gate:
       jobs:
@@ -269,14 +308,8 @@
         - tox-linters:
             vars:
               tox_install_bindep: false
-        - tox-py36:
-            nodeset: ubuntu-bionic
-            timeout: 4800  # 80 minutes
-            vars: *zuul_tox_vars
-        - tox-py38:
-            timeout: 4800  # 80 minutes
-            nodeset: ubuntu-bionic
-            vars: *zuul_tox_vars
+        - zuul-tox-py36
+        - zuul-tox-py38
         - zuul-build-dashboard
         - nodejs-run-lint:
             vars:
@@ -289,12 +322,11 @@
               - web/.*
         - zuul-stream-functional-2.8
         - zuul-stream-functional-2.9
-        - zuul-tox-remote:
-            timeout: 2700  # 45 minutes
+        - zuul-tox-remote
         - zuul-quick-start:
             requires: nodepool-container-image
             dependencies: zuul-upload-image
-        - zuul-client-zuul-functional
+        - zuul-tox-zuul-client
         - zuul-build-python-release
     promote:
       jobs: