From bfc4c8e3c5a73bbd0130c0a4328914ee80072b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Wed, 5 Jan 2022 16:16:33 +0000
Subject: [PATCH] [CI] Stop testing non-stream CentOS

Per [1].
It was agreed on during a Kolla IRC meeting. [2]

This continues building non-stream images but using stream on
the host.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2021-December/026408.html
[2] https://meetings.opendev.org/meetings/kolla/2021/kolla.2021-12-22-15.01.log.html#l-53

Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/823555
Change-Id: I080ad3bbc0e53cec2ac11bfd485c97d88388ef79
---
 .zuul.d/base.yaml   | 12 ------------
 .zuul.d/centos.yaml | 38 ++++----------------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index ae7cb1be36..ebd1f7897f 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -51,12 +51,6 @@
           LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A
           0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
 
-- nodeset:
-    name: kolla-centos8
-    nodes:
-      - name: primary
-        label: centos-8
-
 - nodeset:
     name: kolla-centos8-stream
     nodes:
@@ -75,12 +69,6 @@
       - name: primary
         label: debian-buster
 
-- nodeset:
-    name: kolla-centos8-aarch64
-    nodes:
-      - name: primary
-        label: centos-8-arm64
-
 - nodeset:
     name: kolla-centos8-stream-aarch64
     nodes:
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 374cffd7ee..3e7fd2ef42 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -6,9 +6,6 @@
         - kolla-build-centos8-source
         - kolla-build-centos8s-binary
         - kolla-build-centos8s-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-binary
-        - kolla-ansible-centos8-source-upgrade
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-binary
         - kolla-ansible-centos8s-source-upgrade
@@ -21,8 +18,6 @@
       jobs:
         - kolla-build-centos8-source
         - kolla-build-centos8s-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-source-upgrade
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-source-upgrade
     periodic:
@@ -46,31 +41,6 @@
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-centos8-source
-        - kolla-ansible-centos8-source-bifrost:
-            files: ^docker\/(base|bifrost|openstack-base)\/.*
-        # Test rabbitmq & mariadb changes in multinode ceph jobs.
-        - kolla-ansible-centos8-source-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8-source-upgrade-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8-source-zun:
-            files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
-        - kolla-ansible-centos8-source-scenario-nfv:
-            files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
-        - kolla-ansible-centos8-source-ironic:
-            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
-        - kolla-ansible-centos8-source-swift:
-            files: ^docker/(base|openstack-base|glance|swift)/
-        - kolla-ansible-centos8-source-mariadb:
-            files: ^docker/(base|mariadb)/
-        - kolla-ansible-centos8-source-masakari:
-            files: ^docker/(base|masakari)/
-        - kolla-ansible-centos8-source-ovn:
-            files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
-        - kolla-ansible-centos8-source-prometheus-efk:
-            files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
-        - kolla-ansible-centos8-source-kvm:
-            files: ^docker/nova/
         - kolla-ansible-centos8s-source-bifrost:
             files: ^docker\/(base|bifrost|openstack-base)\/.*
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -100,7 +70,7 @@
 - job:
     name: kolla-build-centos8-binary
     parent: kolla-base
-    nodeset: kolla-centos8
+    nodeset: kolla-centos8-stream
     voting: false
     vars:
       base_distro: centos
@@ -164,7 +134,7 @@
 - job:
     name: kolla-build-centos8-source
     parent: kolla-base
-    nodeset: kolla-centos8
+    nodeset: kolla-centos8-stream
     vars:
       base_distro: centos
       install_type: source
@@ -182,7 +152,7 @@
 - job:
     name: kolla-build-centos8-source-aarch64
     parent: kolla-build-centos8-source
-    nodeset: kolla-centos8-aarch64
+    nodeset: kolla-centos8-stream-aarch64
     voting: false
 
 - job:
@@ -238,7 +208,7 @@
 - job:
     name: kolla-build-no-infra-wheels-centos8-source
     parent: kolla-build-no-infra-wheels-base
-    nodeset: kolla-centos8
+    nodeset: kolla-centos8-stream
     vars:
       base_distro: centos
       install_type: source