From f7c889099326e3464dad6904febdb9644b25d372 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Tue, 18 May 2021 10:39:52 +0200
Subject: [PATCH] Drops support for the non-stream CentOS 8

Change-Id: I9a81c6eb2dc2c474c7c38c0f4cd062ad4c420668
---
 zuul.d/ceph.yaml     |  9 +--------
 zuul.d/jobs.yaml     | 16 +---------------
 zuul.d/nodesets.yaml | 39 ++-------------------------------------
 zuul.d/octavia.yaml  |  9 +--------
 zuul.d/ovn.yaml      | 16 +---------------
 zuul.d/project.yaml  |  6 ------
 6 files changed, 6 insertions(+), 89 deletions(-)

diff --git a/zuul.d/ceph.yaml b/zuul.d/ceph.yaml
index 417a6a3..5385770 100644
--- a/zuul.d/ceph.yaml
+++ b/zuul.d/ceph.yaml
@@ -34,14 +34,7 @@
 - job:
     name: devstack-tobiko-gate-ceph-centos
     parent: devstack-tobiko-gate-ceph
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-
-- job:
-    name: devstack-tobiko-gate-ceph-centos-stream
-    parent: devstack-tobiko-gate-ceph
-    nodeset: devstack-tobiko-centos-stream
+    nodeset: devstack-tobiko-centos
     voting: false
 
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3765d53..d3d7ad1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -135,14 +135,7 @@
 - job:
     name: devstack-tobiko-gate-centos
     parent: devstack-tobiko-gate
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-
-- job:
-    name: devstack-tobiko-gate-centos-stream
-    parent: devstack-tobiko-gate
-    nodeset: devstack-tobiko-centos-stream
+    nodeset: devstack-tobiko-centos
     voting: false
 
 
@@ -224,13 +217,6 @@
     voting: false
 
 
-- job:
-    name: devstack-tobiko-faults-centos-stream
-    parent: devstack-tobiko-faults
-    nodeset: devstack-tobiko-multinode-centos-stream
-    voting: false
-
-
 - job:
     name: devstack-tobiko-faults-ubuntu
     parent: devstack-tobiko-faults
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index a576a63..3e3d99b 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,7 +1,7 @@
 ---
 
 - nodeset:
-    name: devstack-tobiko-centos-stream
+    name: devstack-tobiko-centos
     nodes:
       - name: controller
         label: centos-8-stream
@@ -10,44 +10,9 @@
         nodes:
           - controller
 
+
 - nodeset:
     name: devstack-tobiko-multinode-centos
-    nodes:
-      - name: controller
-        label: centos-8
-      - name: compute1
-        label: centos-8
-      - name: compute2
-        label: centos-8
-
-    groups:
-      # Node where tests are executed and test results collected
-      - name: tempest
-        nodes:
-          - controller
-      # Nodes running the compute service
-      - name: compute
-        nodes:
-          - compute1
-          - compute2
-      # Nodes that are not the controller
-      - name: subnode
-        nodes:
-          - compute1
-          - compute2
-      # Switch node for multinode networking setup
-      - name: switch
-        nodes:
-          - controller
-      # Peer nodes for multinode networking setup
-      - name: peers
-        nodes:
-          - compute1
-          - compute2
-
-
-- nodeset:
-    name: devstack-tobiko-multinode-centos-stream
     nodes:
       - name: controller
         label: centos-8-stream
diff --git a/zuul.d/octavia.yaml b/zuul.d/octavia.yaml
index f2f151e..e7fbb3f 100644
--- a/zuul.d/octavia.yaml
+++ b/zuul.d/octavia.yaml
@@ -43,14 +43,7 @@
 - job:
     name: devstack-tobiko-gate-octavia-centos
     parent: devstack-tobiko-gate-octavia
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-
-- job:
-    name: devstack-tobiko-gate-octavia-centos-stream
-    parent: devstack-tobiko-gate-octavia
-    nodeset: devstack-tobiko-centos-stream
+    nodeset: devstack-tobiko-centos
     voting: false
 
 
diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml
index ecd907a..88671c9 100644
--- a/zuul.d/ovn.yaml
+++ b/zuul.d/ovn.yaml
@@ -114,14 +114,7 @@
 - job:
     name: devstack-tobiko-gate-ovn-centos
     parent: devstack-tobiko-gate-ovn
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-
-- job:
-    name: devstack-tobiko-gate-ovn-centos-stream
-    parent: devstack-tobiko-gate-ovn
-    nodeset: devstack-tobiko-centos-stream
+    nodeset: devstack-tobiko-centos
     voting: false
 
 
@@ -151,13 +144,6 @@
     voting: false
 
 
-- job:
-    name: devstack-tobiko-faults-ovn-centos-stream
-    parent: devstack-tobiko-faults-ovn
-    nodeset: devstack-tobiko-multinode-centos-stream
-    voting: false
-
-
 - job:
     name: devstack-tobiko-faults-ovn-ubuntu
     parent: devstack-tobiko-faults-ovn
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b0b3042..6f5cbc3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -10,22 +10,16 @@
     check: &check_pipeline
       jobs:
         - devstack-tobiko-gate-centos
-        - devstack-tobiko-gate-centos-stream
         - devstack-tobiko-gate-ubuntu
         - devstack-tobiko-gate-octavia-centos
-        - devstack-tobiko-gate-octavia-centos-stream
         - devstack-tobiko-gate-octavia-ubuntu
         - devstack-tobiko-gate-ceph-centos
-        - devstack-tobiko-gate-ceph-centos-stream
         - devstack-tobiko-gate-ceph-ubuntu
         - devstack-tobiko-gate-ovn-centos
-        - devstack-tobiko-gate-ovn-centos-stream
         - devstack-tobiko-gate-ovn-ubuntu
         - devstack-tobiko-faults-centos
-        - devstack-tobiko-faults-centos-stream
         - devstack-tobiko-faults-ubuntu
         - devstack-tobiko-faults-ovn-centos
-        - devstack-tobiko-faults-ovn-centos-stream
         - devstack-tobiko-faults-ovn-ubuntu
 
     periodic: *check_pipeline