From 1f3567396e66fdec9ed800f9d00744af728e3e8d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 30 May 2024 13:23:26 -0700
Subject: [PATCH] Update ansible versions used in unittesting

We were pinning ansible to 2.8 for unittesting but Zuul currently only
supports Ansible 8 and 9. Pin Ansible to 8 in order to better test what
we expect people are using in the wild. This will also enable the
testing of Zuul and Ansible and Zuul Jobs with newer python versions
like 3.12.

In order to run testing with Ansible 8 intsead of 2.8 we drop testing
against python2.7 and python3.8 as neither of them can install an
Ansible version this new.

Change-Id: Icd563def65dcfd40b174218cc4e2b94e0230c374
---
 test-constraints.txt      | 3 ---
 test-requirements.txt     | 2 +-
 tox.ini                   | 6 ------
 zuul-tests.d/project.yaml | 6 ------
 4 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 test-constraints.txt

diff --git a/test-constraints.txt b/test-constraints.txt
deleted file mode 100644
index 7a2acccf2..000000000
--- a/test-constraints.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-soupsieve < 2.0; python_version < '3.5'
-# oauthlib 3.1.1 supports only py > 3.5
-oauthlib < 3.1.1;python_version < '3.6'
diff --git a/test-requirements.txt b/test-requirements.txt
index def9eb4b5..cddcb7442 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@
 # by 4 weeks to give people time to update before any roles start
 # depending on new features.
 
-ansible>=2.8,<2.9
+ansible>=8,<9
 stestr>=1.0.0,<3.0.0;python_version<'3.5' # Apache-2.0
 stestr>=1.0.0;python_version>='3.5' # Apache-2.0
 
diff --git a/tox.ini b/tox.ini
index 289695bd9..85feceae7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,12 +14,6 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
            stestr slowest
 
-[testenv:py27]
-deps =
-    -r{toxinidir}/test-requirements.txt
-    -c{toxinidir}/test-constraints.txt
-basepython = python2.7
-
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
diff --git a/zuul-tests.d/project.yaml b/zuul-tests.d/project.yaml
index d9f7a0383..dfeb89f39 100644
--- a/zuul-tests.d/project.yaml
+++ b/zuul-tests.d/project.yaml
@@ -6,9 +6,6 @@
     check:
       jobs:
         - zuul-tox-docs
-        - tox-py27
-        - tox-py38:
-            nodeset: ubuntu-focal
         - tox-py39:
             nodeset: ubuntu-focal
         - tox-py310:
@@ -18,9 +15,6 @@
     gate:
       jobs:
         - zuul-tox-docs
-        - tox-py27
-        - tox-py38:
-            nodeset: ubuntu-focal
         - tox-py39:
             nodeset: ubuntu-focal
         - tox-py310: