From dc98a8463506ac520c469adb0ef47d0f7753905a Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 19 Aug 2025 09:43:45 -0700
Subject: [PATCH] CI: Fix py27/py36/py37 jobs

Stop using bionic for py27 and py37; we can use pyenv to install it on
jammy.

The py36 job still needs bionic; pin ansible to version 9 now that 11
is the default.

Conflicts:
  .zuul.yaml

Change-Id: I83e3bc609433995875e47c4103ca945154088a65
Signed-off-by: Tim Burke <tim.burke@gmail.com>
Co-Authored-By: Alistair Coles <alistairncoles@gmail.com>
Related-Change: Ida8be4477116d3b44e3d7b470a183d2298e2d3d5
Related-Change: I16af4fc74974979bdf68390b42b2f571a8183a05
(cherry picked from commit 972baf30df79174565b34e8d0081854816e5fc82)
---
 .zuul.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 52911e3946..2c322cc08d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,7 +15,6 @@
 - job:
     name: swift-tox-py27
     parent: swift-tox-base
-    nodeset: ubuntu-bionic
     description: |
       Run unit-tests for swift under cPython version 2.7.
 
@@ -24,6 +23,8 @@
       tools/test-setup.sh.
     vars:
       tox_envlist: py27
+      bindep_profile: test py27
+      python_use_pyenv: True
       python_version: 2.7
     post-run: tools/playbooks/common/cover-post.yaml
 
@@ -31,6 +32,7 @@
     name: swift-tox-py36
     parent: swift-tox-base
     nodeset: ubuntu-bionic
+    ansible-version: 9
     description: |
       Run unit-tests for swift under cPython version 3.6.
 
@@ -46,7 +48,6 @@
 - job:
     name: swift-tox-py37
     parent: swift-tox-base
-    nodeset: ubuntu-bionic
     description: |
       Run unit-tests for swift under cPython version 3.7.
 
@@ -56,6 +57,7 @@
     vars:
       tox_envlist: py37
       bindep_profile: test py37
+      python_use_pyenv: True
       python_version: 3.7
     post-run: tools/playbooks/common/cover-post.yaml
 
@@ -126,7 +128,6 @@
 - job:
     name: swift-tox-func-py27
     parent: swift-tox-base
-    nodeset: ubuntu-bionic
     description: |
       Run functional tests for swift under cPython version 2.7.
 
@@ -136,6 +137,7 @@
     vars:
       tox_envlist: func
       bindep_profile: test py27
+      python_use_pyenv: True
       python_version: 2.7
 
 - job:
@@ -465,6 +467,7 @@
     nodeset: ubuntu-jammy
     vars:
       bindep_profile: test py27
+      python_use_pyenv: True
       python_version: 2.7
       tox_environment:
         TMPDIR: '{{ ansible_env.HOME }}/xfstmp'