From 6117f7062e5a2871edf572809822af497fbe6152 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Mon, 23 Nov 2020 21:50:57 +0200 Subject: [PATCH] Move CI jobs to base on Ansible 2.10 release Change-Id: Ib1884a1a7b69044cf7d0ac9469c677593339eb5c --- .zuul.yaml | 123 +++++++++++++++++++++++------------------------------ tox.ini | 15 +++++-- 2 files changed, 65 insertions(+), 73 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index df19a7f2..e923b1c2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,7 +10,7 @@ - openstack/ansible-collections-openstack vars: zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack - tox_envlist: ansible-2.9 + tox_envlist: ansible tox_install_siblings: true fetch_subunit: false @@ -21,9 +21,22 @@ Run openstack collections functional tests against a master devstack using releases of openstacksdk and latest ansible release vars: - tox_envlist: ansible-2.9 + tox_envlist: ansible tox_install_siblings: false +# Job with Ansible 2.9 for checking backward compatibility +- job: + name: ansible-collections-openstack-functional-devstack-ansible-2.9 + parent: ansible-collections-openstack-functional-devstack + description: | + Run openstack collections functional tests against a master devstack + using master of openstacksdk and stable 2.9 branch of ansible + required-projects: + - name: github.com/ansible/ansible + override-checkout: stable-2.9 + vars: + tox_envlist: ansible-2.9 + - job: name: ansible-collections-openstack-functional-devstack-ansible-2.10 parent: ansible-collections-openstack-functional-devstack @@ -36,18 +49,6 @@ vars: tox_envlist: ansible -- job: - name: ansible-collections-openstack-functional-devstack-ansible-2.9 - parent: ansible-collections-openstack-functional-devstack - description: | - Run openstack collections functional tests against a master devstack - using master of openstacksdk and stable 2.9 branch of ansible - required-projects: - - name: github.com/ansible/ansible - override-checkout: stable-2.9 - vars: - tox_envlist: ansible-2.9 - - job: name: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack @@ -59,7 +60,7 @@ - name: github.com/ansible/ansible override-checkout: devel vars: - tox_envlist: ansible + tox_envlist: ansible-2.11 # Pip installation job - job: @@ -74,96 +75,79 @@ # Stable branches - job: - name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.9 + name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a ussuri devstack - using ussuri brach of openstacksdk and stable 2.9 branch of ansible + using ussuri brach of openstacksdk and stable 2.10 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.9 + override-checkout: stable-2.10 - name: openstack/openstacksdk override-branch: ussuri - name: openstack/devstack override-checkout: ussuri vars: - tox_envlist: ansible-2.9 + tox_envlist: ansible - job: - name: ansible-collections-openstack-functional-devstack-train-ansible-2.9 + name: ansible-collections-openstack-functional-devstack-train-ansible-2.10 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a train devstack - using train brach of openstacksdk and stable 2.9 branch of ansible + using train brach of openstacksdk and stable 2.10 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.9 + override-checkout: stable-2.10 - name: openstack/openstacksdk override-branch: train - name: openstack/devstack override-checkout: train vars: - tox_envlist: ansible-2.9 + tox_envlist: ansible - job: - name: ansible-collections-openstack-functional-devstack-stein-ansible-2.9 + name: ansible-collections-openstack-functional-devstack-stein-ansible-2.10 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a stein devstack - using stein brach of openstacksdk and stable 2.9 branch of ansible + using stein brach of openstacksdk and stable 2.10 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.9 + override-checkout: stable-2.10 - name: openstack/openstacksdk override-branch: stein - name: openstack/devstack override-checkout: stein vars: - tox_envlist: ansible-2.9 + tox_envlist: ansible - job: - name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.9 + name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a rocky devstack - using rocky brach of openstacksdk and stable 2.9 branch of ansible + using rocky brach of openstacksdk and stable 2.10 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.9 + override-checkout: stable-2.10 - name: openstack/openstacksdk override-branch: rocky - name: openstack/devstack override-checkout: rocky vars: - tox_envlist: ansible-2.9 - -- job: - name: ansible-collections-openstack-functional-devstack-queens-ansible-2.9 - parent: ansible-collections-openstack-functional-devstack-ansible-devel - description: | - Run openstack collections functional tests against a queens devstack - using master brach of openstacksdk and stable 2.9 branch of ansible - voting: true - required-projects: - - name: github.com/ansible/ansible - override-checkout: stable-2.9 - - name: openstack/openstacksdk - override-branch: master - - name: openstack/devstack - override-checkout: queens - vars: - tox_envlist: ansible-2.9 + tox_envlist: ansible - job: name: ansible-collections-openstack-functional-devstack-queens-ansible-2.10 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a queens devstack - using master brach of openstacksdk and stable 2.10 branch of ansible + using master branch of openstacksdk and stable 2.10 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible @@ -180,8 +164,8 @@ parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a queens devstack - using master brach of openstacksdk and devel branch of ansible - voting: true + using master branch of openstacksdk and devel branch of ansible + voting: false required-projects: - name: github.com/ansible/ansible override-checkout: devel @@ -190,7 +174,7 @@ - name: openstack/devstack override-checkout: queens vars: - tox_envlist: ansible + tox_envlist: ansible-2.11 # Linters @@ -205,6 +189,8 @@ required-projects: - name: github.com/ansible/ansible override-checkout: devel + vars: + tox_envlist: linters-2.11 - job: name: openstack-tox-linters-ansible-2.10 @@ -254,6 +240,7 @@ dependencies: &deps_unit_lint - tox-pep8 - openstack-tox-linters-ansible-2.9 + - openstack-tox-linters-ansible-2.10 irrelevant-files: &ignore_files - changelogs/.* - COPYING @@ -264,9 +251,6 @@ - tests/sanity/.* - contrib/.* - - ansible-collections-openstack-functional-devstack: - dependencies: *deps_unit_lint - irrelevant-files: *ignore_files - ansible-collections-openstack-functional-devstack-releases: dependencies: *deps_unit_lint irrelevant-files: *ignore_files @@ -282,19 +266,19 @@ - ansible-collections-openstack-functional-devstack-ansible-pip: dependencies: *deps_unit_lint irrelevant-files: *ignore_files - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.9: + - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10: dependencies: *deps_unit_lint irrelevant-files: *ignore_files - - ansible-collections-openstack-functional-devstack-train-ansible-2.9: + - ansible-collections-openstack-functional-devstack-train-ansible-2.10: dependencies: *deps_unit_lint irrelevant-files: *ignore_files - - ansible-collections-openstack-functional-devstack-stein-ansible-2.9: + - ansible-collections-openstack-functional-devstack-stein-ansible-2.10: dependencies: *deps_unit_lint irrelevant-files: *ignore_files - - ansible-collections-openstack-functional-devstack-rocky-ansible-2.9: + - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10: dependencies: *deps_unit_lint irrelevant-files: *ignore_files - - ansible-collections-openstack-functional-devstack-queens-ansible-2.9: + - ansible-collections-openstack-functional-devstack-queens-ansible-2.10: dependencies: *deps_unit_lint irrelevant-files: *ignore_files @@ -317,11 +301,11 @@ - ansible-collections-openstack-functional-devstack-ansible-2.9 - ansible-collections-openstack-functional-devstack-ansible-2.10 - ansible-collections-openstack-functional-devstack-ansible-pip - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.9 - - ansible-collections-openstack-functional-devstack-train-ansible-2.9 - - ansible-collections-openstack-functional-devstack-stein-ansible-2.9 - - ansible-collections-openstack-functional-devstack-rocky-ansible-2.9 - - ansible-collections-openstack-functional-devstack-queens-ansible-2.9 + - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 + - ansible-collections-openstack-functional-devstack-train-ansible-2.10 + - ansible-collections-openstack-functional-devstack-stein-ansible-2.10 + - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 + - ansible-collections-openstack-functional-devstack-queens-ansible-2.10 periodic: jobs: @@ -334,11 +318,10 @@ - ansible-collections-openstack-functional-devstack-ansible-2.10 - ansible-collections-openstack-functional-devstack-ansible-devel - ansible-collections-openstack-functional-devstack-ansible-pip - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.9 - - ansible-collections-openstack-functional-devstack-train-ansible-2.9 - - ansible-collections-openstack-functional-devstack-stein-ansible-2.9 - - ansible-collections-openstack-functional-devstack-rocky-ansible-2.9 - - ansible-collections-openstack-functional-devstack-queens-ansible-2.9 + - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10 + - ansible-collections-openstack-functional-devstack-train-ansible-2.10 + - ansible-collections-openstack-functional-devstack-stein-ansible-2.10 + - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10 - ansible-collections-openstack-functional-devstack-queens-ansible-2.10 - ansible-collections-openstack-functional-devstack-queens-ansible-devel - bifrost-collections-src diff --git a/tox.ini b/tox.ini index 157683f5..fbaeebd8 100644 --- a/tox.ini +++ b/tox.ini @@ -31,9 +31,6 @@ commands = stestr run {posargs} commands = flake8 -# NOTE(mordred): Until ansible 2.10 is released we need to override deps for this env -# here because we need to use 2.10 galaxy to build the collection and properly -# respect build_ignore [testenv:build] deps = pbr @@ -62,6 +59,12 @@ commands = {[testenv:linters]commands} deps = -r{toxinidir}/test-requirements-2.9.txt +[testenv:linters-2.11] +passenv = {[testenv:linters]passenv} +commands = {[testenv:linters]commands} +deps = + -r{toxinidir}/test-requirements-2.11.txt + [testenv:venv] deps = -r{toxinidir}/test-requirements.txt @@ -102,3 +105,9 @@ deps = -r{toxinidir}/test-requirements-2.9.txt passenv = {[testenv:ansible]passenv} commands = {[testenv:ansible]commands} + +[testenv:ansible-2.11] +deps = + -r{toxinidir}/test-requirements-2.11.txt +passenv = {[testenv:ansible]passenv} +commands = {[testenv:ansible]commands}