From 1842d7bed4b476d724c1501c92443deeb2528f3d Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 13 Nov 2017 20:24:38 -0500
Subject: [PATCH] Add zuulv3 jobs support

Now that zuulv3 is live, we can switch to native ansible jobs.

Change-Id: Idb7b57149def695c73f3d22e6500507e66e9189d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .zuul.yaml             | 40 ++++++++++++++++++++++++++++++++++++++++
 defaults/main.yaml     |  1 +
 tasks/install/git.yaml |  1 +
 tests/ansible.cfg      |  2 --
 tests/inventory        |  3 +--
 tests/test.yaml        | 15 +++++----------
 tox.ini                |  2 +-
 7 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 .zuul.yaml
 delete mode 100644 tests/ansible.cfg

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..3ef81a3
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,40 @@
+- job:
+    name: ansible-role-diskimage-builder
+    run: tests/test.yaml
+    required-projects:
+      - name: openstack/diskimage-builder
+    roles:
+      - zuul: openstack/ansible-role-diskimage-builder
+
+- job:
+    name: ansible-role-diskimage-builder-centos-7
+    parent: ansible-role-diskimage-builder
+    nodeset: centos-7
+
+- job:
+    name: ansible-role-diskimage-builder-fedora-26
+    parent: ansible-role-diskimage-builder
+    nodeset: fedora-26
+
+- job:
+    name: ansible-role-diskimage-builder-ubuntu-xenial
+    parent: ansible-role-diskimage-builder
+    nodeset: ubuntu-xenial
+
+- project:
+    name: openstack/ansible-role-diskimage-builder
+    templates:
+      - windmill-jobs-fedora-26
+      - windmill-jobs-xenial
+    check:
+      jobs:
+        - ansible-role-diskimage-builder-centos-7
+        - ansible-role-diskimage-builder-fedora-26
+        - ansible-role-diskimage-builder-ubuntu-xenial
+        - tox-linters
+    gate:
+      jobs:
+        - ansible-role-diskimage-builder-centos-7
+        - ansible-role-diskimage-builder-fedora-26
+        - ansible-role-diskimage-builder-ubuntu-xenial
+        - tox-linters
diff --git a/defaults/main.yaml b/defaults/main.yaml
index a36c6db..d837188 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -20,6 +20,7 @@ diskimage_builder_task_manager:
 diskimage_builder_git_dest: /opt/ansible-role-diskimage-builder/git/openstack/diskimage-builder
 diskimage_builder_git_uri: https://git.openstack.org/openstack/diskimage-builder
 # diskimage_builder_git_refspec:
+# diskimage_builder_git_update:
 # diskimage_builder_git_version:
 
 diskimage_builder_install_method: git
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index cf2c59f..ff5aac7 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -18,6 +18,7 @@
     dest: "{{ diskimage_builder_git_dest }}"
     refspec: "{{ diskimage_builder_git_refspec|default(omit) }}"
     repo: "{{ diskimage_builder_git_uri }}"
+    update: "{{ diskimage_builder_git_update|default(omit) }}"
     version: "{{ diskimage_builder_git_version|default(omit) }}"
 
 - name: Set diskimage_builder_pip_name to local git repo.
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
deleted file mode 100644
index 6c8a344..0000000
--- a/tests/ansible.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[defaults]
-roles_path = ../..
diff --git a/tests/inventory b/tests/inventory
index 59f3595..2fbb50c 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,2 +1 @@
-[all]
-localhost ansible_connection=ssh
+localhost
diff --git a/tests/test.yaml b/tests/test.yaml
index 3a782e4..5c4f7e2 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -12,16 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- hosts: localhost
+- hosts: all
   vars:
-    rolename: "{{ lookup('pipe', 'pwd') | dirname | basename }}"
-  pre_tasks:
-    # Make sure OS does not have a stale package cache.
-    - name: Update apt cache.
-      become: yes
-      apt:
-        update_cache: yes
-      when: ansible_os_family == 'Debian'
+    diskimage_builder_git_dest: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/diskimage-builder"
+    diskimage_builder_git_update: false
+    rolename: ansible-role-diskimage-builder
 
   roles:
     - "{{ rolename }}"
@@ -29,7 +24,7 @@
   post_tasks:
     - name: Register diskimage_builder_git_dest_stat.
       stat:
-        path: /opt/ansible-role-diskimage-builder/git/openstack/diskimage-builder
+        path: /home/zuul/src/git.openstack.org/openstack/diskimage-builder
       register: diskimage_builder_git_dest_stat
 
     - name: Assert diskimage_builder_git_dest tests.
diff --git a/tox.ini b/tox.ini
index c2595c0..1d1a9a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [testenv:linters]
 setenv =
-  ANSIBLE_CONFIG = tests/ansible.cfg
+  ANSIBLE_ROLES_PATH = ..
 whitelist_externals = bash
 commands =
   # PEP8 Lint Check