From 980536c32ee393e2fe2b71c8f3f56b64aef39df3 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Mon, 4 Oct 2021 12:26:19 +0300 Subject: [PATCH] Move CI to use Ansible 2.12 version as main Move only from victoria, since Ansible 2.12 is installed with py > 3.8. Remove ussuri from voting jobs, use it for experimental only. Change-Id: I74b7272794ea5fbafb7d81a5cf0068c09130bb0d --- .zuul.yaml | 72 ++++++++++++++++++++---------------- test-requirements-2.12.txt | 11 ++++++ tests/sanity/ignore-2.13.txt | 0 tox.ini | 12 ++++++ 4 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 test-requirements-2.12.txt create mode 100644 tests/sanity/ignore-2.13.txt diff --git a/.zuul.yaml b/.zuul.yaml index 8aae31a6..dd10c65e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -41,7 +41,7 @@ required-projects: - openstack/octavia - name: github.com/ansible/ansible - override-checkout: stable-2.11 + override-checkout: stable-2.12 files: - ^ci/roles/loadbalancer/.*$ - ^plugins/modules/lb_health_monitor.py @@ -95,13 +95,25 @@ parent: ansible-collections-openstack-functional-devstack description: | Run openstack collections functional tests against a master devstack - using master of openstacksdk and stable 2.11 branch of ansible + using master of openstacksdk and stable 2.12 branch of ansible required-projects: - name: github.com/ansible/ansible override-checkout: stable-2.11 vars: tox_envlist: ansible +- job: + name: ansible-collections-openstack-functional-devstack-ansible-2.12 + parent: ansible-collections-openstack-functional-devstack + description: | + Run openstack collections functional tests against a master devstack + using master of openstacksdk and stable 2.12 branch of ansible + required-projects: + - name: github.com/ansible/ansible + override-checkout: stable-2.12 + vars: + tox_envlist: ansible + - job: name: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack @@ -113,36 +125,36 @@ - name: github.com/ansible/ansible override-checkout: devel vars: - tox_envlist: ansible-2.11 + tox_envlist: ansible-2.12 # Stable branches tests - job: - name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 + name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a wallaby devstack - using wallaby brach of openstacksdk and stable 2.11 branch of ansible + using wallaby brach of openstacksdk and stable 2.12 branch of ansible voting: true override-checkout: stable/wallaby required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.11 + override-checkout: stable-2.12 - name: openstack/openstacksdk override-checkout: stable/wallaby vars: tox_envlist: ansible - job: - name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 + name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12 parent: ansible-collections-openstack-functional-devstack-ansible-devel description: | Run openstack collections functional tests against a victoria devstack - using victoria brach of openstacksdk and stable 2.11 branch of ansible + using victoria brach of openstacksdk and stable 2.12 branch of ansible voting: true override-checkout: stable/victoria required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.11 + override-checkout: stable-2.12 - name: openstack/openstacksdk override-checkout: stable/victoria vars: @@ -271,22 +283,22 @@ - name: github.com/ansible/ansible override-checkout: devel vars: - tox_envlist: linters-2.11 + tox_envlist: linters-2.12 python_version: 3.8 bindep_profile: test py38 - job: - name: openstack-tox-linters-ansible-2.11 + name: openstack-tox-linters-ansible-2.12 parent: openstack-tox-linters nodeset: ubuntu-focal description: | - Run openstack collections linter tests using the 2.11 branch of ansible + Run openstack collections linter tests using the 2.12 branch of ansible voting: true required-projects: - name: github.com/ansible/ansible - override-checkout: stable-2.11 + override-checkout: stable-2.12 vars: - tox_envlist: linters-2.11 + tox_envlist: linters-2.12 python_version: 3.8 bindep_profile: test py38 @@ -373,27 +385,25 @@ jobs: - tox-pep8 - openstack-tox-linters-ansible-devel - - openstack-tox-linters-ansible-2.11 + - openstack-tox-linters-ansible-2.12 - openstack-tox-linters-ansible-2.9 - ansible-collections-openstack-functional-devstack: dependencies: &deps_unit_lint - tox-pep8 - openstack-tox-linters-ansible-2.9 - - openstack-tox-linters-ansible-2.11 + - openstack-tox-linters-ansible-2.12 - ansible-collections-openstack-functional-devstack-releases: dependencies: *deps_unit_lint - ansible-collections-openstack-functional-devstack-ansible-2.9: dependencies: *deps_unit_lint - - ansible-collections-openstack-functional-devstack-ansible-2.11: + - ansible-collections-openstack-functional-devstack-ansible-2.12: dependencies: *deps_unit_lint - ansible-collections-openstack-functional-devstack-ansible-devel: dependencies: *deps_unit_lint - - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11: + - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12: dependencies: *deps_unit_lint - - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11: - dependencies: *deps_unit_lint - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11: + - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12: dependencies: *deps_unit_lint - ansible-collections-openstack-functional-devstack-train-ansible-2.11: dependencies: *deps_unit_lint @@ -422,15 +432,14 @@ gate: jobs: - tox-pep8 - - openstack-tox-linters-ansible-2.11 + - openstack-tox-linters-ansible-2.12 - openstack-tox-linters-ansible-2.9 - ansible-collections-openstack-functional-devstack - ansible-collections-openstack-functional-devstack-releases - ansible-collections-openstack-functional-devstack-ansible-2.9 - - ansible-collections-openstack-functional-devstack-ansible-2.11 - - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 - - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11 + - ansible-collections-openstack-functional-devstack-ansible-2.12 + - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12 + - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12 - ansible-collections-openstack-functional-devstack-train-ansible-2.11 - ansible-collections-openstack-functional-devstack-queens-ansible-2.11 - ansible-collections-openstack-functional-devstack-octavia @@ -439,16 +448,15 @@ periodic: jobs: - openstack-tox-linters-ansible-devel - - openstack-tox-linters-ansible-2.11 + - openstack-tox-linters-ansible-2.12 - openstack-tox-linters-ansible-2.9 - ansible-collections-openstack-functional-devstack - ansible-collections-openstack-functional-devstack-releases - ansible-collections-openstack-functional-devstack-ansible-2.9 - - ansible-collections-openstack-functional-devstack-ansible-2.11 + - ansible-collections-openstack-functional-devstack-ansible-2.12 - ansible-collections-openstack-functional-devstack-ansible-devel - - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11 - - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11 - - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11 + - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12 + - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12 - ansible-collections-openstack-functional-devstack-train-ansible-2.11 - ansible-collections-openstack-functional-devstack-queens-ansible-2.11 - ansible-collections-openstack-functional-devstack-queens-ansible-devel @@ -458,6 +466,8 @@ experimental: jobs: + - ansible-collections-openstack-functional-devstack-ansible-2.11 + - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11 - ansible-collections-openstack-functional-devstack-stein-ansible-2.11 - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11 - ansible-collections-openstack-functional-devstack-queens-ansible-devel diff --git a/test-requirements-2.12.txt b/test-requirements-2.12.txt new file mode 100644 index 00000000..ff1a34e7 --- /dev/null +++ b/test-requirements-2.12.txt @@ -0,0 +1,11 @@ +openstacksdk +ansible-core +pycodestyle +flake8 +pylint +voluptuous +yamllint +rstcheck +ruamel.yaml +#galaxy-importer # see https://review.opendev.org/#/c/743054 +tox diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt new file mode 100644 index 00000000..e69de29b diff --git a/tox.ini b/tox.ini index 0aa1d915..ecf1e1bb 100644 --- a/tox.ini +++ b/tox.ini @@ -65,6 +65,12 @@ commands = {[testenv:linters]commands} deps = -r{toxinidir}/test-requirements-2.11.txt +[testenv:linters-2.12] +passenv = {[testenv:linters]passenv} +commands = {[testenv:linters]commands} +deps = + -r{toxinidir}/test-requirements-2.12.txt + [testenv:venv] deps = -r{toxinidir}/test-requirements.txt @@ -112,6 +118,12 @@ deps = passenv = {[testenv:ansible]passenv} commands = {[testenv:ansible]commands} +[testenv:ansible-2.12] +deps = + -r{toxinidir}/test-requirements-2.12.txt +passenv = {[testenv:ansible]passenv} +commands = {[testenv:ansible]commands} + [testenv:galaxy-release] deps = ansible-core