From 4074db1bd0c99d13a09b949cdad19efb32537b9b Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Wed, 11 Dec 2024 16:41:13 +0200
Subject: [PATCH] Replace 2.16 jobs by 2.18 Ansible jobs

Change-Id: I4cae065e961a06d44792bef2e6479c30fe242911
---
 .zuul.yaml                          | 27 ++++++++++++---------------
 tests/requirements-ansible-2.18.txt | 12 ++++++++++++
 tox.ini                             |  6 ++++--
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 tests/requirements-ansible-2.18.txt

diff --git a/.zuul.yaml b/.zuul.yaml
index d4dd679f..d27fe286 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -164,7 +164,7 @@
       tox_install_siblings: false
 
 - job:
-    name: ansible-collections-openstack-functional-devstack-ansible-2.16
+    name: ansible-collections-openstack-functional-devstack-ansible-2.18
     parent: ansible-collections-openstack-functional-devstack-base
     branches: master
     description: |
@@ -172,9 +172,9 @@
       using master of openstacksdk and stable 2.16 branch of ansible
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.16
+        override-checkout: stable-2.18
     vars:
-      tox_envlist: ansible_2_16
+      tox_envlist: ansible_2_18
 
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-devel
@@ -218,16 +218,15 @@
       bindep_profile: test py310
 
 - job:
-    name: openstack-tox-linters-ansible-2.16
+    name: openstack-tox-linters-ansible-2.18
     parent: openstack-tox-linters-ansible
     description: |
-      Run openstack collections linter tests using the 2.16 branch of ansible
+      Run openstack collections linter tests using the 2.18 branch of ansible
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.16
+        override-checkout: stable-2.18
     vars:
-      # ensure_tox_version: '<4'
-      tox_envlist: linters_2_16
+      tox_envlist: linters_2_18
       python_version: "3.12"
       bindep_profile: test py312
 
@@ -283,10 +282,10 @@
       jobs:
         - tox-pep8
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.16
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
-        - ansible-collections-openstack-functional-devstack-ansible-2.16
+        - ansible-collections-openstack-functional-devstack-ansible-2.18
         - ansible-collections-openstack-functional-devstack-ansible-devel
         - ansible-collections-openstack-functional-devstack-magnum
         - ansible-collections-openstack-functional-devstack-octavia
@@ -301,20 +300,18 @@
     gate:
       jobs:
         - tox-pep8
-        - openstack-tox-linters-ansible-2.16
-        # - ansible-collections-openstack-functional-devstack
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack-releases
-        # - ansible-collections-openstack-functional-devstack-ansible-2.12
         - ansible-collections-openstack-functional-devstack-magnum
         - ansible-collections-openstack-functional-devstack-octavia
 
     periodic:
       jobs:
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.16
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
-        - ansible-collections-openstack-functional-devstack-ansible-2.16
+        - ansible-collections-openstack-functional-devstack-ansible-2.18
         - ansible-collections-openstack-functional-devstack-ansible-devel
         - bifrost-collections-src
         - bifrost-keystone-collections-src
diff --git a/tests/requirements-ansible-2.18.txt b/tests/requirements-ansible-2.18.txt
new file mode 100644
index 00000000..833a8322
--- /dev/null
+++ b/tests/requirements-ansible-2.18.txt
@@ -0,0 +1,12 @@
+ansible-core>=2.18.0,<2.19.0
+flake8
+galaxy-importer
+openstacksdk
+pycodestyle
+pylint
+rstcheck
+ruamel.yaml
+tox
+voluptuous
+yamllint
+setuptools
diff --git a/tox.ini b/tox.ini
index 54f3cb82..0fa186d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,7 +43,7 @@ commands =
     ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact
     bash {toxinidir}/tools/check-import.sh {toxinidir}
 
-[testenv:linters_{2_9,2_11,2_12,2_16,latest}]
+[testenv:linters_{2_9,2_11,2_12,2_16,2_18,latest}]
 allowlist_externals = bash
 commands =
     {[testenv:build]commands}
@@ -58,6 +58,7 @@ deps =
     linters_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt
     linters_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt
     linters_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt
+    linters_2_16:   -r{toxinidir}/tests/requirements-ansible-2.18.txt
 passenv = *
 
 [flake8]
@@ -71,7 +72,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_9,2_11,2_12,2_16,latest}]
+[testenv:ansible_{2_9,2_11,2_12,2_16,2_18,latest}]
 allowlist_externals = bash
 commands =
     bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}
@@ -82,6 +83,7 @@ deps =
     ansible_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt
     ansible_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt
     ansible_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt
+    ansible_2_18:   -r{toxinidir}/tests/requirements-ansible-2.18.txt
 # Need to pass some env vars for the Ansible playbooks
 passenv =
     HOME