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: Ida9cec271c83b8d66ab185b693077574a89091a5
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

.zuul.yaml

@@ -1,11 +1,17 @@
 - job:
-    name: ansible-role-diskimage-builder
+    name: ansible-role-diskimage-builder-base
-    run: tests/test.yaml
+    pre-run: tests/playbooks/pre.yaml
-    required-projects:
+    run: tests/playbooks/run.yaml
-      - name: openstack/diskimage-builder
     roles:
       - zuul: openstack/ansible-role-diskimage-builder
 
+# Testing for diskimage_builder_install_method: pip
+- job:
+    name: ansible-role-diskimage-builder
+    parent: ansible-role-diskimage-builder-base
+    vars:
+      diskimage_builder_install_method: pip
+
 - job:
     name: ansible-role-diskimage-builder-fedora-27
     parent: ansible-role-diskimage-builder
@@ -21,6 +27,31 @@
     parent: ansible-role-diskimage-builder
     nodeset: ubuntu-xenial
 
+# Testing for diskimage_builder_install_method: git
+- job:
+    name: ansible-role-diskimage-builder-src
+    parent: ansible-role-diskimage-builder-base
+    required-projects:
+      - name: openstack/diskimage-builder
+    vars:
+      diskimage_builder_git_update: false
+      diskimage_builder_install_method: git
+
+- job:
+    name: ansible-role-diskimage-builder-src-fedora-27
+    parent: ansible-role-diskimage-builder-src
+    nodeset: fedora-27
+
+- job:
+    name: ansible-role-diskimage-builder-src-ubuntu-bionic
+    parent: ansible-role-diskimage-builder-src
+    nodeset: ubuntu-bionic
+
+- job:
+    name: ansible-role-diskimage-builder-src-ubuntu-xenial
+    parent: ansible-role-diskimage-builder-src
+    nodeset: ubuntu-xenial
+
 - project:
     templates:
       - windmill-jobs-fedora-27
@@ -31,9 +62,14 @@
         - ansible-role-diskimage-builder-fedora-27
         - ansible-role-diskimage-builder-ubuntu-bionic
         - ansible-role-diskimage-builder-ubuntu-xenial
+        - ansible-role-diskimage-builder-src-fedora-27
+        - ansible-role-diskimage-builder-src-ubuntu-bionic
+        - ansible-role-diskimage-builder-src-ubuntu-xenial
         - tox-linters
     gate:
       jobs:
         - ansible-role-diskimage-builder-fedora-27
         - ansible-role-diskimage-builder-ubuntu-xenial
+        - ansible-role-diskimage-builder-src-fedora-27
+        - ansible-role-diskimage-builder-src-ubuntu-xenial
         - tox-linters

tests/playbooks/pre.yaml

@@ -0,0 +1,8 @@
+- hosts: all
+  tasks:
+    - name: Disable extra wheels mirror
+      become: yes
+      lineinfile:
+        dest: /etc/pip.conf
+        regexp: ^extra-index-url
+        state: absent

tests/playbooks/run.yaml

@@ -14,7 +14,6 @@
 ---
 - hosts: all
   vars:
-    diskimage_builder_git_update: false
     rolename: ansible-role-diskimage-builder
 
   roles:
@@ -25,9 +24,11 @@
       stat:
         path: /home/zuul/src/git.openstack.org/openstack/diskimage-builder
       register: diskimage_builder_git_dest_stat
+      when: diskimage_builder_install_method == 'git'
 
     - name: Assert diskimage_builder_git_dest tests.
       assert:
         that:
           - diskimage_builder_git_dest_stat.stat.exists
           - diskimage_builder_git_dest_stat.stat.isdir
+      when: diskimage_builder_install_method == 'git'