From 052abed755c8447a2ceff27f09614179965aac4e Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Thu, 3 Nov 2022 10:31:21 -0700
Subject: [PATCH] Move base CI job to jammy

We'll want that by the time we can add a py310 job. It'll also make us
be explicit about the OS to use for py27 and py36-py39 jobs.

Also, update bindep so we don't try to install py2 stuff on jammy.

Change-Id: If70cd2fc03d10e55cd782ec8ffc87bd2b2b321ea
---
 .zuul.yaml | 33 +++++++++++++++++++++++----------
 bindep.txt |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f6ab8dfdd9..210640b63d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,7 @@
 - job:
     name: swift-tox-base
-    parent: openstack-tox-py27
+    parent: openstack-tox-py310
+    nodeset: ubuntu-jammy
     description: |
       Base job for swift-tox jobs.
 
@@ -14,6 +15,7 @@
 - job:
     name: swift-tox-py27
     parent: swift-tox-base
+    nodeset: ubuntu-bionic
     description: |
       Run unit-tests for swift under cPython version 2.7.
 
@@ -22,6 +24,7 @@
       tools/test-setup.sh.
     vars:
       tox_envlist: py27
+      python_version: 2.7
       tox_environment:
         NOSE_COVER_HTML: 1
         NOSE_COVER_HTML_DIR: '{toxinidir}/cover'
@@ -29,8 +32,11 @@
 
 - job:
     name: swift-tox-py27-centos-7
-    parent: swift-tox-py27
+    parent: openstack-tox-py27
     nodeset: centos-7
+    vars:
+      tox_environment:
+        TMPDIR: '{{ ansible_env.HOME }}/xfstmp'
 
 - job:
     name: swift-tox-py36
@@ -45,6 +51,7 @@
     vars:
       tox_envlist: py36
       bindep_profile: test py36
+      python_version: 3.6
       tox_environment:
         NOSE_COVER_HTML: 1
         NOSE_COVER_HTML_DIR: '{toxinidir}/cover'
@@ -131,6 +138,7 @@
 - job:
     name: swift-tox-func-py27
     parent: swift-tox-base
+    nodeset: ubuntu-bionic
     description: |
       Run functional tests for swift under cPython version 2.7.
 
@@ -139,6 +147,8 @@
       tools/test-setup.sh.
     vars:
       tox_envlist: func
+      bindep_profile: test py27
+      python_version: 2.7
 
 - job:
     name: swift-tox-func-py38
@@ -225,12 +235,13 @@
 
 - job:
     name: swift-tox-func-py27-centos-7
-    parent: swift-tox-func-py27
-    nodeset: centos-7
+    parent: swift-tox-py27-centos-7
+    vars:
+      tox_envlist: func
 
 - job:
     name: swift-tox-func-encryption-py27
-    parent: swift-tox-base
+    parent: swift-tox-func-py27
     description: |
       Run functional tests for swift under cPython version 2.7.
 
@@ -242,12 +253,13 @@
 
 - job:
     name: swift-tox-func-encryption-py27-centos-7
-    parent: swift-tox-func-encryption-py27
-    nodeset: centos-7
+    parent: swift-tox-func-py27-centos-7
+    vars:
+      tox_envlist: func-encryption
 
 - job:
     name: swift-tox-func-ec-py27
-    parent: swift-tox-base
+    parent: swift-tox-func-py27
     description: |
       Run functional tests for swift under cPython version 2.7.
 
@@ -259,8 +271,9 @@
 
 - job:
     name: swift-tox-func-ec-py27-centos-7
-    parent: swift-tox-func-ec-py27
-    nodeset: centos-7
+    parent: swift-tox-func-py27-centos-7
+    vars:
+      tox_envlist: func-ec
 
 - job:
     name: swift-dsvm-functional
diff --git a/bindep.txt b/bindep.txt
index 59ab57d234..fd57584c81 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -17,7 +17,7 @@ libxslt-devel [platform:rpm]
 libxslt1-dev [platform:dpkg]
 libxslt-dev [platform:apk]
 memcached
-python-dev [platform:dpkg platform:apk]
+python-dev [platform:dpkg platform:apk !platform:ubuntu-jammy]
 python-devel [platform:rpm !py36]
 python3-dev [platform:dpkg platform:apk test]
 python3-devel [platform:rpm !py27 test]