From e79264d4f1905e418d36b2e12081c0370d25f701 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 19 Apr 2018 20:27:47 -0400
Subject: [PATCH] Refactor jobs to support pip / git installation testing

Because we want users to support both pip / git install methods,
refactor testing to support the testing of that.

Change-Id: I633aafce865c7d5f3b2a28aa6c5b47dc449e00ea
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .zuul.d/jobs.yaml                             | 48 +++++++++++++++++--
 .zuul.d/project-templates.yaml                | 26 ++++++++++
 .zuul.d/projects.yaml                         |  3 ++
 .../{extra-vars.yaml => extra-vars/git.yaml}  | 10 ++++
 tests/extra-vars/pip.yaml                     |  5 ++
 tests/playbooks/run.yaml                      |  2 +-
 6 files changed, 89 insertions(+), 5 deletions(-)
 rename tests/{extra-vars.yaml => extra-vars/git.yaml} (77%)
 create mode 100644 tests/extra-vars/pip.yaml

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index ffdbda1..287fdea 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -22,22 +22,62 @@
       - openstack-infra/shade
       - openstack-infra/zuul
 
+# Testing for install_method: pip
+- job:
+    name: windmill
+    parent: windmill-base
+    vars:
+      windmill_extra_vars_file: tests/extra-vars/pip.yaml
+
 - job:
     name: windmill-centos-7
-    parent: windmill-base
+    parent: windmill
     nodeset: centos-7
 
 - job:
     name: windmill-fedora-27
-    parent: windmill-base
+    parent: windmill
     nodeset: fedora-27
 
 - job:
     name: windmill-ubuntu-bionic
-    parent: windmill-base
+    parent: windmill
     nodeset: ubuntu-bionic
 
 - job:
     name: windmill-ubuntu-xenial
-    parent: windmill-base
+    parent: windmill
+    nodeset: ubuntu-xenial
+
+# Testing for install_method: git
+- job:
+    name: windmill-src
+    parent: windmill-base
+    required-projects:
+      - openstack/diskimage-builder
+      - openstack-infra/gear
+      - openstack-infra/nodepool
+      - openstack-infra/shade
+      - openstack-infra/zuul
+    vars:
+      windmill_extra_vars_file: tests/extra-vars/git.yaml
+
+- job:
+    name: windmill-src-centos-7
+    parent: windmill-src
+    nodeset: centos-7
+
+- job:
+    name: windmill-src-fedora-27
+    parent: windmill-src
+    nodeset: fedora-27
+
+- job:
+    name: windmill-src-ubuntu-bionic
+    parent: windmill-src
+    nodeset: ubuntu-bionic
+
+- job:
+    name: windmill-src-ubuntu-xenial
+    parent: windmill-src
     nodeset: ubuntu-xenial
diff --git a/.zuul.d/project-templates.yaml b/.zuul.d/project-templates.yaml
index 67bd0b3..d38483b 100644
--- a/.zuul.d/project-templates.yaml
+++ b/.zuul.d/project-templates.yaml
@@ -44,3 +44,29 @@
       jobs:
         - windmill-ubuntu-xenial:
             voting: false
+
+- project-template:
+    name: windmill-jobs-src-fedora-27
+    check:
+      jobs:
+        - windmill-src-fedora-27
+    gate:
+      queue: windmill
+      jobs:
+        - windmill-src-fedora-27
+
+- project-template:
+    name: windmill-jobs-src-bionic
+    check:
+      jobs:
+        - windmill-src-ubuntu-bionic
+
+- project-template:
+    name: windmill-jobs-src-xenial
+    check:
+      jobs:
+        - windmill-src-ubuntu-xenial
+    gate:
+      queue: windmill
+      jobs:
+        - windmill-src-ubuntu-xenial
diff --git a/.zuul.d/projects.yaml b/.zuul.d/projects.yaml
index 9642ef3..eb02d5e 100644
--- a/.zuul.d/projects.yaml
+++ b/.zuul.d/projects.yaml
@@ -4,3 +4,6 @@
       - windmill-jobs-fedora-27
       - windmill-jobs-bionic
       - windmill-jobs-xenial
+      - windmill-jobs-src-fedora-27
+      - windmill-jobs-src-bionic
+      - windmill-jobs-src-xenial
diff --git a/tests/extra-vars.yaml b/tests/extra-vars/git.yaml
similarity index 77%
rename from tests/extra-vars.yaml
rename to tests/extra-vars/git.yaml
index deaac6e..f780317 100644
--- a/tests/extra-vars.yaml
+++ b/tests/extra-vars/git.yaml
@@ -2,10 +2,20 @@
 # gate, we don't want our roles to update git after we pushed the repos
 # from zuul-executors.
 diskimage_builder_git_update: false
+diskimage_builder_install_method: git
+
 gear_git_update: false
+gear_install_method: git
+
 nodepool_git_update: false
+nodepool_install_method: git
+
 shade_git_update: false
+shade_install_method: git
+
 zuul_git_update: false
+zuul_install_method: git
+
 # NOTE(pabelanger): In the gate, we want to create a zuul-test user /
 # group as zuul already exists on our images.
 zuul_user_name: zuul-test
diff --git a/tests/extra-vars/pip.yaml b/tests/extra-vars/pip.yaml
new file mode 100644
index 0000000..0c5f287
--- /dev/null
+++ b/tests/extra-vars/pip.yaml
@@ -0,0 +1,5 @@
+# NOTE(pabelanger): In the gate, we want to create a zuul-test user /
+# group as zuul already exists on our images.
+zuul_user_name: zuul-test
+zuul_user_group: zuul-test
+zuul_user_home: /var/lib/zuul
diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml
index 62bc8f7..0a5cf97 100644
--- a/tests/playbooks/run.yaml
+++ b/tests/playbooks/run.yaml
@@ -8,7 +8,7 @@
     - name: Run ansible-playbook for site.yaml
       args:
         chdir: "{{ windmill_src_dir }}"
-      shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml --extra-vars "@tests/extra-vars.yaml"
+      shell: "tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml -e @{{ windmill_extra_vars_file }}"
 
     - name: Run ansible-playbook for prove.yaml
       args: