From eee7741251b701742b6954a986c102510d07d96e Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 4 Jun 2024 08:58:19 -0700
Subject: [PATCH] CI: Move off CentOS 8

Remove swift-tox-py36-centos-8-stream job entirely.

Move the following jobs to CentOS 9:

  - swift-tox-func-s3api-ceph-s3tests-tempauth
  - swift-tox-func-s3api-tests-tempauth
  - swift-multinode-rolling-upgrade, as well as the other rolling
    upgrade jobs

Remove the swift-multinode-rolling-upgrade-victoria job, as py39
support (required for CentOS 9) was not added until wallaby.

Change-Id: I4f6b9c07af7bc768654f1a5d0c66b048e0f2c9c1
---
 .zuul.yaml | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 18da33ca32..915e0c0c8d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -44,11 +44,6 @@
       python_version: 3.6
     post-run: tools/playbooks/common/cover-post.yaml
 
-- job:
-    name: swift-tox-py36-centos-8-stream
-    parent: swift-tox-py36
-    nodeset: centos-8-stream
-
 - job:
     name: swift-tox-py37
     parent: swift-tox-base
@@ -325,13 +320,13 @@
     name: swift-tox-func-s3api-ceph-s3tests-tempauth
     parent: unittests
     voting: false
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     description: |
       Setup a SAIO dev environment and run ceph-s3tests
     timeout: 5400
     vars:
       s3_acl: yes
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -346,13 +341,13 @@
 - job:
     name: swift-tox-func-s3api-tests-tempauth
     parent: unittests
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     description: |
       Setup a SAIO dev environment and run our s3api test suite
     timeout: 1800
     vars:
       s3_acl: yes
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/common/install_dependencies.yaml
       - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -406,18 +401,18 @@
     post-run: tools/playbooks/cors/post.yaml
 
 - nodeset:
-    name: swift-five-nodes-py3
+    name: swift-five-nodes-centos-9
     nodes:
       - name: test-runner1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: proxy1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: account1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: container1
-        label: centos-8-stream
+        label: centos-9-stream
       - name: object1
-        label: centos-8-stream
+        label: centos-9-stream
     groups:
       - name: test-runner
         nodes:
@@ -449,12 +444,12 @@
 - job:
     name: swift-multinode-rolling-upgrade
     parent: multinode
-    nodeset: swift-five-nodes-py3
+    nodeset: swift-five-nodes-centos-9
     description: |
       Build a 4 node swift cluster and run functional tests
     timeout: 5400
     vars:
-      bindep_profile: test py36
+      bindep_profile: test py39
     pre-run:
       - tools/playbooks/multinode_setup/pre.yaml
       - tools/playbooks/common/install_dependencies.yaml
@@ -464,12 +459,6 @@
     run: tools/playbooks/multinode_setup/run.yaml
     post-run: tools/playbooks/probetests/post.yaml
 
-- job:
-    name: swift-multinode-rolling-upgrade-victoria
-    parent: swift-multinode-rolling-upgrade
-    vars:
-      previous_swift_version: victoria-eom
-
 - job:
     name: swift-multinode-rolling-upgrade-wallaby
     parent: swift-multinode-rolling-upgrade
@@ -820,7 +809,6 @@
         - swift-tox-py37
         - swift-tox-py39
         - swift-tox-py310
-        - swift-tox-py36-centos-8-stream
         - swift-tox-func-py39-centos-9-stream
         - swift-tox-func-encryption-py39-centos-9-stream
         - swift-tox-func-ec-py39-centos-9-stream