From 74c42829eba015bae99419e326efcfe89ab3ddec Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Mon, 8 Mar 2021 15:42:37 +0200
Subject: [PATCH] Remove unnecessary zuul layout overrides use templates
 instead

This removes unnecessary zuul layout overrides. The containers
multinode and standalone/scenarios are already included via the
wired-up templates. Keeps only the undercloud-minion which is not
in the tripleo-multinode-container-minimal-pipeline [1] but updates
the consumer job vars. Part of tripleo-ci optimisation at [2].

[1] https://opendev.org/openstack/tripleo-ci/src/commit/67a58a43788dfff284ec55eff6f4e65c0116160b/zuul.d/multinode-jobs.yaml#L71-L85
[2] https://review.opendev.org/q/topic:tripleo-ci-reduce

Change-Id: I7c4ba85cbc1525079a94cb76aa9576b24f1d0fbb
---
 zuul.d/layout.yaml | 53 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 47 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2443e6865..df56f4455 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -18,55 +18,14 @@
               - openstack-tox-pep8
               - 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: &cprovider
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-standalone:
-            vars: &sa_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              tags:
-                - standalone
-            dependencies: *cprovider
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
-            vars: *multi_consumer_vars
-            dependencies: *cprovider
-        - tripleo-ci-centos-8-scenario001-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *cprovider
-        - tripleo-ci-centos-8-scenario002-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *cprovider
-        - tripleo-ci-centos-8-scenario003-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *cprovider
-        - tripleo-ci-centos-8-scenario004-standalone:
-            vars: *sa_consumer_vars
-            dependencies: *cprovider
         - tripleo-ci-centos-8-containers-undercloud-minion:
-            vars: &undercloud_consumer_vars
+            vars:
               consumer_job: true
-              tags:
-              - undercloud-setup
-              - undercloud-scripts
-              - undercloud-install
-              - undercloud-validate
-            dependencies: *cprovider
+              build_container_images: false
+              remove_tags:
+                - build
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
             files:
               - ^config-generator/.*minion.*$
               - ^tripleoclient/config/.*minion.*$