From 15226bf473798aa28db99978ab3a4fbbbd8be1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Fri, 7 Jan 2022 18:27:43 +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 Ubuntu on
the host (as that is the most reliable we have left here).

[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

Change-Id: Ia1ece3b74bd9bc1b0b8cc123abb23048bc50894d
---
 .zuul.d/base.yaml   | 12 ------------
 .zuul.d/centos.yaml | 28 +++-------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 6018c15873..c8bf3a335d 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-ubuntu-bionic
     nodes:
@@ -69,12 +63,6 @@
       - name: primary
         label: debian-buster
 
-- nodeset:
-    name: kolla-centos8-aarch64
-    nodes:
-      - name: primary
-        label: centos-8-arm64
-
 - nodeset:
     name: kolla-debian-buster-aarch64
     nodes:
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 24a21088f1..63b9f3673c 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -4,9 +4,6 @@
       jobs:
         - kolla-build-centos8-binary
         - kolla-build-centos8-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-binary
-        - kolla-ansible-centos8-source-upgrade
     check-arm64:
       jobs:
         - kolla-build-centos8-source-aarch64
@@ -14,8 +11,6 @@
       queue: kolla
       jobs:
         - kolla-build-centos8-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-source-upgrade
     periodic:
       jobs:
         - kolla-publish-centos8-source-quay
@@ -28,28 +23,11 @@
       jobs:
         - kolla-publish-centos8-source-dockerhub
         - kolla-publish-centos8-binary-dockerhub
-    experimental:
-      jobs:
-        - 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)/
 
 - job:
     name: kolla-build-centos8-binary
     parent: kolla-base
-    nodeset: kolla-centos8
+    nodeset: kolla-ubuntu-bionic
     voting: false
     vars:
       base_distro: centos
@@ -80,7 +58,7 @@
 - job:
     name: kolla-build-centos8-source
     parent: kolla-base
-    nodeset: kolla-centos8
+    nodeset: kolla-ubuntu-bionic
     vars:
       base_distro: centos
       install_type: source
@@ -88,7 +66,7 @@
 - job:
     name: kolla-build-centos8-source-aarch64
     parent: kolla-build-centos8-source
-    nodeset: kolla-centos8-aarch64
+    nodeset: kolla-ubuntu-bionic-aarch64
     voting: false
 
 - job: