diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..470cadc --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,40 @@ +- job: + name: ansible-role-shade + run: tests/test + required-projects: + - name: openstack-infra/shade + roles: + - zuul: openstack/ansible-role-shade + +- job: + name: ansible-role-shade-centos-7 + parent: ansible-role-shade + nodeset: centos-7 + +- job: + name: ansible-role-shade-fedora-26 + parent: ansible-role-shade + nodeset: fedora-26 + +- job: + name: ansible-role-shade-ubuntu-xenial + parent: ansible-role-shade + nodeset: ubuntu-xenial + +- project: + name: openstack/ansible-role-shade + templates: + - windmill-jobs-fedora-26 + - windmill-jobs-xenial + check: + jobs: + - ansible-role-shade-centos-7 + - ansible-role-shade-fedora-26 + - ansible-role-shade-ubuntu-xenial + - tox-linters + gate: + jobs: + - ansible-role-shade-centos-7 + - ansible-role-shade-fedora-26 + - ansible-role-shade-ubuntu-xenial + - tox-linters 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 2f403f1..9eb040d 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: test +- 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' + shade_git_dest: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/shade" + shade_git_update: false + rolename: ansible-role-shade roles: - "{{ rolename }}" @@ -29,7 +24,7 @@ post_tasks: - name: Register shade_git_dest_stat. stat: - path: /opt/ansible-role-shade/git/openstack-infra/shade + path: /home/zuul/src/git.openstack.org/openstack-infra/shade register: shade_git_dest_stat - name: Assert shade_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