From 7d93ae6ff9f39cc9b3202f5f2aa81f1238d15fe3 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 5 Mar 2021 14:26:29 +0200
Subject: [PATCH] Removes unneeded zuul layout overrides - templates for
 consistency

As part of [1] this removes the unneeded zuul layout overrides.
All the jobs removed here are already included with the relevant
templates. The files: matches that were used for the scenario
standalones are moved to the template layout via the depends-on.

The build-containers-ubi8 job is not needed as it is exercised
by the content providers and we have removed this job from other
tripleo layouts.

[1] https://review.opendev.org/q/topic:tripleo-ci-reduce
Depends-On: I633bc01bc1a8cd8d1216e503eaa9a43aef9a7fa0

Change-Id: I95efa61361882875505e5e359dece23a5a67bfc9
(cherry picked from commit 22e5366de13a342ca6f65173ce069513fa80e1f5)
---
 zuul.d/layout.yaml | 85 ----------------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index f39d71a37..a533a0ff1 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -24,91 +24,6 @@
               - openstack-tox-py27
               - openstack-tox-py36
               - openstack-tox-py37
-        - tripleo-ci-centos-8-containers-multinode:
-            vars: &multi_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              tags:
-                - undercloud-setup
-                - undercloud-scripts
-                - undercloud-install
-                - undercloud-post-install
-                - tripleo-validations
-                - overcloud-scripts
-                - overcloud-prep-config
-                - overcloud-prep-containers
-                - overcloud-deploy
-                - overcloud-post-deploy
-                - overcloud-validate
-            dependencies: &deps_cprovider
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-undercloud-containers:
-            vars: &undercloud_consumer_vars
-              consumer_job: true
-              tags:
-              - undercloud-setup
-              - undercloud-scripts
-              - undercloud-install
-              - undercloud-validate
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-standalone:
-            vars: &sa_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              tags:
-                - standalone
-            dependencies: *deps_cprovider
-        - tripleo-build-containers-ubi-8:
-            dependencies: *deps_unit_lint
-            files:
-              - ^container-images/.*$
-              - ^tripleo_common/image/builder/.*$
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
-            vars: *multi_consumer_vars
-            dependencies: *deps_cprovider
-            files:
-              - workbooks/package_update.yaml
-              - workbooks/baremetal.yaml
-              - ^container-images/.*$
-              - tripleo_common/actions/deployment.py
-              - tripleo_common/actions/container_images.py
-              - tripleo_common/image/kolla_builder.py
-              - scripts/.*$
-        - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            vars: *multi_consumer_vars
-            dependencies: *deps_cprovider
-            files:
-              - ^container-images/.*$
-              - tripleo_common/image/kolla_builder.py
-        - tripleo-ci-centos-8-scenario001-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario001-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-            files:
-              - ^container-images/tcib/base/collectd.*$
-              - ^container-images/tcib/base/os/aodh.*$
-              - ^container-images/tcib/base/os/ceilometer.*$
-              - ^container-images/tcib/base/os/cinder.*$
-              - ^container-images/tcib/base/os/gnocchi.*$
-              - ^container-images/tcib/base/os/heat.*$
-              - ^container-images/tcib/base/os/panko.*$
-              - ^container-images/tcib/base/qdrouterd.*$
-              - ^container-images/tcib/base/rabbitmq.*$
-              - ^container-images/tcib/base/redis.*$
-        - tripleo-ci-centos-8-scenario002-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario003-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario004-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
-        - tripleo-ci-centos-8-scenario012-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *deps_cprovider
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint
         - tripleo-buildimage-ironic-python-agent-centos-8: