From a869c8661e105dd6d430a7b9189bd155daecee2a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 13 Apr 2018 16:22:16 -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: Ida9cec271c83b8d66ab185b693077574a89091a5 Signed-off-by: Paul Belanger --- .zuul.yaml | 44 ++++++++++++++++++++++--- tests/playbooks/pre.yaml | 8 +++++ tests/{test.yaml => playbooks/run.yaml} | 3 +- 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 tests/playbooks/pre.yaml rename tests/{test.yaml => playbooks/run.yaml} (90%) diff --git a/.zuul.yaml b/.zuul.yaml index 18d7c35..9da05fc 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,11 +1,17 @@ - job: - name: ansible-role-diskimage-builder - run: tests/test.yaml - required-projects: - - name: openstack/diskimage-builder + name: ansible-role-diskimage-builder-base + pre-run: tests/playbooks/pre.yaml + run: tests/playbooks/run.yaml 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 diff --git a/tests/playbooks/pre.yaml b/tests/playbooks/pre.yaml new file mode 100644 index 0000000..a33abbc --- /dev/null +++ b/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 diff --git a/tests/test.yaml b/tests/playbooks/run.yaml similarity index 90% rename from tests/test.yaml rename to tests/playbooks/run.yaml index 493a190..e761bc5 100644 --- a/tests/test.yaml +++ b/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'