From 76617f883e535a77008aac80d5350d0f0c889f8d Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Wed, 13 Oct 2021 07:52:53 +0200
Subject: [PATCH] Switch centos8 jobs to centos-8-stream

Change-Id: I658a4097e120d4f6a49fa1a7945a8d999709d1bd
---
 zuul.d/jobs.yaml     | 16 ++++++++--------
 zuul.d/projects.yaml |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a9375a2588..44d0c7ed32 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,14 +19,14 @@
         amphora_os_release: focal
 
 - job:
-    name: publish-openstack-octavia-amphora-image-centos8
-    nodeset: centos-8
+    name: publish-openstack-octavia-amphora-image-centos-8-stream
+    nodeset: centos-8-stream
     parent: publish-openstack-octavia-amphora-image
     description: |
-      Publish CentOS 8 based amphora image to tarballs.o.o.
+      Publish CentOS 8 Stream based amphora image to tarballs.o.o.
     vars:
         amphora_os: centos
-        amphora_os_release: 8
+        amphora_os_release: 8-stream
 
 - job:
     name: octavia-grenade
@@ -164,17 +164,17 @@
         - openstack/diskimage-builder
 
 - job:
-    name: octavia-amphora-image-build-live-centos8
+    name: octavia-amphora-image-build-live-centos-8-stream
     parent: octavia-amphora-image-build
-    nodeset: centos-8
+    nodeset: centos-8-stream
     description: |
-      Builds a CentOS 8 amphora image using diskimage-builder from Git
+      Builds a CentOS 8 Stream amphora image using diskimage-builder from Git
       master. This job does not publish the image.
     required-projects:
         - openstack/diskimage-builder
     vars:
         amphora_os: centos
-        amphora_os_release: 8
+        amphora_os_release: 8-stream
 
 - job:
     name: octavia-v2-dsvm-scenario-nftables
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 667b1bbbe8..bfc3d7b3ab 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -68,7 +68,7 @@
         - octavia-v2-dsvm-scenario-amphora-v2-no-jobboard:
             irrelevant-files: *irrelevant-files
             voting: false
-        - octavia-v2-dsvm-scenario-centos-8:
+        - octavia-v2-dsvm-scenario-centos-8-stream:
             irrelevant-files: *irrelevant-files
             voting: false
     gate:
@@ -99,7 +99,7 @@
       jobs:
         - publish-openstack-octavia-amphora-image-focal:
             branches: ^(?!stable/.*).*$
-        - publish-openstack-octavia-amphora-image-centos8:
+        - publish-openstack-octavia-amphora-image-centos-8-stream:
             branches: ^(?!stable/.*).*$
         - octavia-amphora-image-build
         - octavia-grenade-ffu