From df4a39e3c86b014a2b72f7a1e3df537660f25332 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]. Part of
wider 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
(cherry picked from commit 7746b2e57f546a04231b490143085a1157b14c27)
---
 zuul.d/layout.yaml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 73a6dce48..9e32ac056 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -21,29 +21,18 @@
         - openstack-tox-py36
         - openstack-tox-py37
         - tripleo-ci-centos-8-content-provider:
-            dependencies: &deps_unit_lint
+            dependencies:
               - 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
-              remove_tags:
-                - build
-            dependencies: &deps_cprovider
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-build-containers-ubi-8:
-            dependencies: *deps_unit_lint
-            files:
-              - ^tripleoclient/v1/tripleo_container_image.py$
         - tripleo-ci-centos-8-containers-undercloud-minion:
-            vars: &sa_consumer_vars
+            vars:
               consumer_job: true
               build_container_images: false
               remove_tags:
                 - build
-            dependencies: *deps_cprovider
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
             files:
               - ^config-generator/.*minion.*$
               - ^tripleoclient/config/.*minion.*$
@@ -53,7 +42,3 @@
       queue: tripleo
       jobs:
         - openstack-tox-pep8
-        - tripleo-build-containers-ubi-8:
-            dependencies: *deps_unit_lint
-            files:
-              - ^tripleoclient/v1/tripleo_container_image.py$