From da4a211b2d1dd147dead0e3db63a373b43b3c09e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 17 Sep 2026 07:45:54 +0200 Subject: [PATCH] CI: Test with ansible-core 2.21 Change-Id: Iabb17e193ebe1ba3e471cb46e3f323d43cb8ef9a Signed-off-by: Pierre Riteau --- .zuul.yaml | 31 +++++++++++++++++++++++++++++ tests/requirements-ansible-2.21.txt | 12 +++++++++++ tox.ini | 6 ++++-- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tests/requirements-ansible-2.21.txt diff --git a/.zuul.yaml b/.zuul.yaml index a907e250..97de7a35 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -245,6 +245,19 @@ vars: tox_envlist: ansible_2_20 +- job: + name: ansible-collections-openstack-functional-devstack-ansible-2.21 + parent: ansible-collections-openstack-functional-devstack-base + branches: master + description: | + Run openstack collections functional tests against a master devstack + using master of openstacksdk and stable 2.21 branch of ansible + required-projects: + - name: github.com/ansible/ansible + override-checkout: stable-2.21 + vars: + tox_envlist: ansible_2_21 + - job: name: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack-base @@ -324,6 +337,19 @@ python_version: "3.12" bindep_profile: test py312 +- job: + name: openstack-tox-linters-ansible-2.21 + parent: openstack-tox-linters-ansible + description: | + Run openstack collections linter tests using the 2.21 branch of ansible + required-projects: + - name: github.com/ansible/ansible + override-checkout: stable-2.21 + vars: + tox_envlist: linters_2_21 + python_version: "3.12" + bindep_profile: test py312 + # Cross-checks with other projects - job: name: bifrost-collections-src @@ -379,11 +405,13 @@ - openstack-tox-linters-ansible-2.18 - openstack-tox-linters-ansible-2.19 - openstack-tox-linters-ansible-2.20 + - openstack-tox-linters-ansible-2.21 - ansible-collections-openstack-functional-devstack - ansible-collections-openstack-functional-devstack-releases - ansible-collections-openstack-functional-devstack-ansible-2.18 - ansible-collections-openstack-functional-devstack-ansible-2.19 - ansible-collections-openstack-functional-devstack-ansible-2.20 + - ansible-collections-openstack-functional-devstack-ansible-2.21 - ansible-collections-openstack-functional-devstack-ansible-devel - ansible-collections-openstack-functional-devstack-magnum - ansible-collections-openstack-functional-devstack-manila @@ -402,6 +430,7 @@ - openstack-tox-linters-ansible-2.18 - openstack-tox-linters-ansible-2.19 - openstack-tox-linters-ansible-2.20 + - openstack-tox-linters-ansible-2.21 - ansible-collections-openstack-functional-devstack-releases - ansible-collections-openstack-functional-devstack-magnum - ansible-collections-openstack-functional-devstack-manila @@ -413,11 +442,13 @@ - openstack-tox-linters-ansible-2.18 - openstack-tox-linters-ansible-2.19 - openstack-tox-linters-ansible-2.20 + - openstack-tox-linters-ansible-2.21 - ansible-collections-openstack-functional-devstack - ansible-collections-openstack-functional-devstack-releases - ansible-collections-openstack-functional-devstack-ansible-2.18 - ansible-collections-openstack-functional-devstack-ansible-2.19 - ansible-collections-openstack-functional-devstack-ansible-2.20 + - ansible-collections-openstack-functional-devstack-ansible-2.21 - ansible-collections-openstack-functional-devstack-ansible-devel - bifrost-collections-src - bifrost-keystone-collections-src diff --git a/tests/requirements-ansible-2.21.txt b/tests/requirements-ansible-2.21.txt new file mode 100644 index 00000000..af596620 --- /dev/null +++ b/tests/requirements-ansible-2.21.txt @@ -0,0 +1,12 @@ +ansible-core>=2.21.0,<2.22.0 +flake8 +galaxy-importer +openstacksdk +pycodestyle +pylint +rstcheck +ruamel.yaml +tox +voluptuous +yamllint +setuptools diff --git a/tox.ini b/tox.ini index 1e8a1614..89a7bb10 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,7 @@ commands = ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact bash {toxinidir}/tools/check-import.sh {toxinidir} -[testenv:linters_{2_18,2_19,2_20,latest}] +[testenv:linters_{2_18,2_19,2_20,2_21,latest}] allowlist_externals = bash commands = {[testenv:build]commands} @@ -55,6 +55,7 @@ deps = linters_2_18: -r{toxinidir}/tests/requirements-ansible-2.18.txt linters_2_19: -r{toxinidir}/tests/requirements-ansible-2.19.txt linters_2_20: -r{toxinidir}/tests/requirements-ansible-2.20.txt + linters_2_21: -r{toxinidir}/tests/requirements-ansible-2.21.txt passenv = * [flake8] @@ -68,7 +69,7 @@ ignore = W503,H4,E501,E402,H301 show-source = True exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections -[testenv:ansible_{2_18,2_19,2_20,latest}] +[testenv:ansible_{2_18,2_19,2_20,2_21,latest}] allowlist_externals = bash commands = bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs} @@ -78,6 +79,7 @@ deps = ansible_2_18: -r{toxinidir}/tests/requirements-ansible-2.18.txt ansible_2_19: -r{toxinidir}/tests/requirements-ansible-2.19.txt ansible_2_20: -r{toxinidir}/tests/requirements-ansible-2.20.txt + ansible_2_21: -r{toxinidir}/tests/requirements-ansible-2.21.txt # Need to pass some env vars for the Ansible playbooks passenv = HOME