From 219f2593b0cf629f4cf61ec73d6c0dc89f6300a5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 6 Dec 2018 20:26:32 -0500 Subject: [PATCH] Clean up zuul tests Sync latest version of our testing jobs. Change-Id: Ieeb1eddd52ed61239893de85cd005ce29e6116aa Signed-off-by: Paul Belanger --- .zuul.yaml | 20 +++----------------- tox.ini | 1 + 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 2bed4b8..bd6a437 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,11 +1,12 @@ - job: name: ansible-role-openstacksdk-base + parent: unittests pre-run: tests/playbooks/pre.yaml run: tests/playbooks/run.yaml roles: - zuul: openstack/ansible-role-openstacksdk -# Testing for nodepool_install_method: pip +# Testing for openstacksdk_install_method: pip - job: name: ansible-role-openstacksdk parent: ansible-role-openstacksdk-base @@ -20,12 +21,7 @@ parent: ansible-role-openstacksdk nodeset: ubuntu-bionic -- job: - name: ansible-role-openstacksdk-ubuntu-xenial - parent: ansible-role-openstacksdk - nodeset: ubuntu-xenial - -# Testing for nodepool_install_method: git +# Testing for openstacksdk_install_method: git - job: name: ansible-role-openstacksdk-src parent: ansible-role-openstacksdk-base @@ -45,31 +41,21 @@ parent: ansible-role-openstacksdk-src nodeset: ubuntu-bionic -- job: - name: ansible-role-openstacksdk-src-ubuntu-xenial - parent: ansible-role-openstacksdk-src - nodeset: ubuntu-xenial - - project: templates: - windmill-jobs-fedora-latest - windmill-jobs-bionic - - windmill-jobs-xenial check: jobs: - ansible-role-openstacksdk-fedora-latest - ansible-role-openstacksdk-ubuntu-bionic - - ansible-role-openstacksdk-ubuntu-xenial - ansible-role-openstacksdk-src-fedora-latest - ansible-role-openstacksdk-src-ubuntu-bionic - - ansible-role-openstacksdk-src-ubuntu-xenial - tox-linters gate: jobs: - ansible-role-openstacksdk-fedora-latest - ansible-role-openstacksdk-ubuntu-bionic - - ansible-role-openstacksdk-ubuntu-xenial - ansible-role-openstacksdk-src-fedora-latest - ansible-role-openstacksdk-src-ubuntu-bionic - - ansible-role-openstacksdk-src-ubuntu-xenial - tox-linters diff --git a/tox.ini b/tox.ini index 03ba7dc..33fa54c 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = docs,linters skipsdist = True [testenv] +basepython = python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt