From 2c21bb01721987f497607ef71e22913edfaafabb Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 31 Mar 2021 17:07:44 +0100
Subject: [PATCH] CI: Switch to CentOS Stream 8

This change switches CentOS CI jobs to use CentOS stream 8 nodepool
images. Kolla containers switched to CentOS stream already.

Depends-On: https://review.opendev.org/c/openstack/kayobe/+/784926
Depends-On: https://review.opendev.org/c/openstack/kayobe/+/784853

Story: 2008795
Task: 42196

Change-Id: I02c76344bcb0b350fd96010becca52f259e1ee6f
---
 zuul.d/jobs.yaml     | 28 ++++++++++++++--------------
 zuul.d/nodesets.yaml |  6 ++++++
 zuul.d/project.yaml  | 28 ++++++++++++++--------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0b6e71e05..7ca09d477 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -91,9 +91,9 @@
     timeout: 7200
 
 - job:
-    name: kayobe-overcloud-centos8
+    name: kayobe-overcloud-centos8s
     parent: kayobe-overcloud-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-overcloud-ubuntu-focal
@@ -107,9 +107,9 @@
       tls_enabled: true
 
 - job:
-    name: kayobe-overcloud-tls-centos8
+    name: kayobe-overcloud-tls-centos8s
     parent: kayobe-overcloud-tls-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-overcloud-upgrade-base
@@ -124,9 +124,9 @@
     timeout: 9000
 
 - job:
-    name: kayobe-overcloud-upgrade-centos8
+    name: kayobe-overcloud-upgrade-centos8s
     parent: kayobe-overcloud-upgrade-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-seed-base
@@ -140,9 +140,9 @@
     timeout: 5400
 
 - job:
-    name: kayobe-seed-centos8
+    name: kayobe-seed-centos8s
     parent: kayobe-seed-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-seed-ubuntu-focal
@@ -161,9 +161,9 @@
     timeout: 7200
 
 - job:
-    name: kayobe-overcloud-host-configure-centos8
+    name: kayobe-overcloud-host-configure-centos8s
     parent: kayobe-overcloud-host-configure-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-overcloud-host-configure-ubuntu-focal
@@ -183,9 +183,9 @@
     timeout: 5400
 
 - job:
-    name: kayobe-seed-upgrade-centos8
+    name: kayobe-seed-upgrade-centos8s
     parent: kayobe-seed-upgrade-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-seed-vm-base
@@ -200,9 +200,9 @@
     timeout: 5400
 
 - job:
-    name: kayobe-seed-vm-centos8
+    name: kayobe-seed-vm-centos8s
     parent: kayobe-seed-vm-base
-    nodeset: kayobe-centos8
+    nodeset: kayobe-centos8s
 
 - job:
     name: kayobe-seed-vm-ubuntu-focal
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index a38de518a..1e7398714 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -5,6 +5,12 @@
       - name: primary
         label: centos-8
 
+- nodeset:
+    name: kayobe-centos8s
+    nodes:
+      - name: primary
+        label: centos-8-stream
+
 - nodeset:
     name: kayobe-ubuntu-focal
     nodes:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b41bd9770..df0c590ed 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -10,16 +10,16 @@
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
-        - kayobe-overcloud-centos8
+        - kayobe-overcloud-centos8s
         - kayobe-overcloud-ubuntu-focal
-        - kayobe-overcloud-tls-centos8
-        - kayobe-overcloud-host-configure-centos8
+        - kayobe-overcloud-tls-centos8s
+        - kayobe-overcloud-host-configure-centos8s
         - kayobe-overcloud-host-configure-ubuntu-focal
-        - kayobe-overcloud-upgrade-centos8
-        - kayobe-seed-centos8
+        - kayobe-overcloud-upgrade-centos8s
+        - kayobe-seed-centos8s
         - kayobe-seed-ubuntu-focal
-        - kayobe-seed-upgrade-centos8
-        - kayobe-seed-vm-centos8
+        - kayobe-seed-upgrade-centos8s
+        - kayobe-seed-vm-centos8s
         - kayobe-seed-vm-ubuntu-focal
 
     gate:
@@ -28,14 +28,14 @@
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
-        - kayobe-overcloud-centos8
+        - kayobe-overcloud-centos8s
         - kayobe-overcloud-ubuntu-focal
-        - kayobe-overcloud-tls-centos8
-        - kayobe-overcloud-host-configure-centos8
+        - kayobe-overcloud-tls-centos8s
+        - kayobe-overcloud-host-configure-centos8s
         - kayobe-overcloud-host-configure-ubuntu-focal
-        - kayobe-overcloud-upgrade-centos8
-        - kayobe-seed-centos8
+        - kayobe-overcloud-upgrade-centos8s
+        - kayobe-seed-centos8s
         - kayobe-seed-ubuntu-focal
-        - kayobe-seed-upgrade-centos8
-        - kayobe-seed-vm-centos8
+        - kayobe-seed-upgrade-centos8s
+        - kayobe-seed-vm-centos8s
         - kayobe-seed-vm-ubuntu-focal