From d6da694b0f39b897d3c2a22642e8d48ea619e659 Mon Sep 17 00:00:00 2001 From: Marios Andreou 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 (cherry picked from commit ca603f39b6d612fd2950cd7d7eb84ae3e2cecff9) --- zuul.d/layout.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index ce969ca43..f39d71a37 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -9,6 +9,7 @@ - tripleo-multinode-container-minimal-pipeline - tripleo-undercloud-jobs-pipeline - tripleo-build-containers-jobs + - tripleo-buildimage-jobs - tripleo-standalone-scenarios-pipeline - tripleo-upgrades-train-pipeline check: @@ -110,28 +111,13 @@ dependencies: *deps_cprovider - 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: - 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/.*$