From ca603f39b6d612fd2950cd7d7eb84ae3e2cecff9 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Thu, 25 Feb 2021 13:29:52 +0200
Subject: [PATCH] Remove layout override and wire up buildimage template
 instead

This wires up the tripleo-buildimage-jobs and updates buildimage
job overrides in the check layout. The depends-on adds the
files: matches in the template layout so no need to override here.
The gate layout overrides are removed altogether as we don't want
the dependencies: optimization in the gate. Part of wider tripleo-ci
optimization [1].

[1] https://review.opendev.org/q/topic:tripleo-ci-reduce
Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/777083

Change-Id: I24615a067a56ac226b07c2ebcf477b3682dfed2f
---
 zuul.d/layout.yaml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index cb816e755..6f1300b9b 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -8,6 +8,7 @@
       - tripleo-multinode-container-minimal-pipeline
       - tripleo-undercloud-jobs-pipeline
       - tripleo-build-containers-jobs
+      - tripleo-buildimage-jobs
       - tripleo-standalone-scenarios-pipeline
       - tripleo-upgrades-master-pipeline
     vars:
@@ -114,16 +115,12 @@
               - ^container-images/tcib/base/os/octavia.*$
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
         - tripleo-buildimage-ironic-python-agent-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
         - tripleo-buildimage-overcloud-hardened-full-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
+
+
     gate:
       queue: tripleo
       jobs:
@@ -131,15 +128,6 @@
         - openstack-tox-linters
         - tripleo-cross-tripleoclient-py37
         - tripleo-ci-centos-8-content-provider
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files:
-              - ^image-yaml/.*$
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files:
-              - ^image-yaml/.*$
-        - tripleo-buildimage-overcloud-hardened-full-centos-8:
-            files:
-              - ^image-yaml/.*$
         - tripleo-build-containers-ubi-8:
             dependencies: *deps_unit_lint
             files: