From 546c9629ebf1831f7dca55ccd3f7b0e424a788b8 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 7 Dec 2021 16:16:01 -0800
Subject: [PATCH] Move CI from CentOS 8 to CentOS 8 Stream

See also: http://lists.opendev.org/pipermail/service-announce/2021-December/000029.html

Change-Id: Id34eea3f20621c2b25cc7753b1323d4ffb88f11b
---
 .zuul.yaml | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ac9afc74cc..2293584b1e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -51,9 +51,9 @@
     post-run: tools/playbooks/common/cover-post.yaml
 
 - job:
-    name: swift-tox-py36-centos-8
+    name: swift-tox-py36-centos-8-stream
     parent: swift-tox-py36
-    nodeset: centos-8
+    nodeset: centos-8-stream
 
 - job:
     name: swift-tox-py37
@@ -156,22 +156,22 @@
       python_version: 3.8
 
 - job:
-    name: swift-tox-func-py36-centos-8
+    name: swift-tox-func-py36-centos-8-stream
     parent: swift-tox-func-py38
-    nodeset: centos-8
+    nodeset: centos-8-stream
     vars:
       bindep_profile: test py36
       python_version: 3.6
 
 - job:
-    name: swift-tox-func-encryption-py36-centos-8
-    parent: swift-tox-func-py36-centos-8
+    name: swift-tox-func-encryption-py36-centos-8-stream
+    parent: swift-tox-func-py36-centos-8-stream
     vars:
       tox_envlist: func-encryption-py3
 
 - job:
-    name: swift-tox-func-ec-py36-centos-8
-    parent: swift-tox-func-py36-centos-8
+    name: swift-tox-func-ec-py36-centos-8-stream
+    parent: swift-tox-func-py36-centos-8-stream
     vars:
       tox_envlist: func-ec-py3
 
@@ -339,9 +339,9 @@
     post-run: tools/playbooks/probetests/post.yaml
 
 - job:
-    name: swift-probetests-centos-8
+    name: swift-probetests-centos-8-stream
     parent: swift-probetests-centos-7
-    nodeset: centos-8
+    nodeset: centos-8-stream
     description: |
       Setup a SAIO dev environment and run Swift's probe tests
       under Python 3.
@@ -349,9 +349,12 @@
       bindep_profile: test py36
 
 - job:
-    name: swift-probetests-centos-8-arm64
-    parent: swift-probetests-centos-8
-    nodeset: centos-8-arm64
+    name: swift-probetests-centos-8-stream-arm64
+    parent: swift-probetests-centos-8-stream
+    nodeset:
+      nodes:
+        - name: swift-centos-8-stream-arm64
+          label: centos-8-stream-arm64
     description: |
       Setup a SAIO dev environment and run Swift's probe tests
       under Python 3 on top of arm64 architecture.
@@ -572,7 +575,7 @@
      jobs:
        - swift-tox-py38-arm64
        - swift-tox-py39-arm64
-       - swift-probetests-centos-8-arm64
+       - swift-probetests-centos-8-stream-arm64
        - swift-tox-func-encryption-py38-arm64
        - swift-tox-func-py38-arm64
 
@@ -649,7 +652,7 @@
               - ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
               - ^test/(cors|unit|functional)/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-probetests-centos-8:
+        - swift-probetests-centos-8-stream:
             irrelevant-files: *probetest-irrelevant-files
         - swift-dsvm-functional:
             irrelevant-files: *functest-irrelevant-files
@@ -697,7 +700,7 @@
         - swift-func-cors
         - swift-probetests-centos-7:
             irrelevant-files: *probetest-irrelevant-files
-        - swift-probetests-centos-8:
+        - swift-probetests-centos-8-stream:
             irrelevant-files: *probetest-irrelevant-files
         - swift-dsvm-functional:
             irrelevant-files: *functest-irrelevant-files
@@ -721,10 +724,10 @@
         - swift-tox-func-py27-centos-7
         - swift-tox-func-encryption-py27-centos-7
         - swift-tox-func-ec-py27-centos-7
-        - swift-tox-py36-centos-8
-        - swift-tox-func-py36-centos-8
-        - swift-tox-func-encryption-py36-centos-8
-        - swift-tox-func-ec-py36-centos-8
+        - swift-tox-py36-centos-8-stream
+        - swift-tox-func-py36-centos-8-stream
+        - swift-tox-func-encryption-py36-centos-8-stream
+        - swift-tox-func-ec-py36-centos-8-stream
         - swift-multinode-rolling-upgrade-rocky
         - swift-multinode-rolling-upgrade-stein
         - swift-multinode-rolling-upgrade-train