From 54414a14b47de5f15bb5ca01009fca041462f2bd Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 5 Mar 2021 12:56:41 +0200
Subject: [PATCH] Remove scenario007-multinode and scenario010-standalone from
 layout

This removes tripleo-ci-centos-8-scenario007-multinode-oooq-container
from the train layout override because it is redundant [1] the job
doesn't run on train or even U.

Also removes the tripleo-ci-centos-8-scenario010-standalone override
as it is already included by the tripleo-standalone-scenarios-pipeline
template. The files: matches here meant the job was run on more changes
than defined by the template itself [2]. Part of CI optimisation [3].

[1] https://opendev.org/openstack/tripleo-ci/src/commit/17d7d68398dba728e499dd7d42fb2672cc9474c2/zuul.d/multinode-jobs.yaml#L312
[2] https://opendev.org/openstack/tripleo-ci/src/commit/17d7d68398dba728e499dd7d42fb2672cc9474c2/zuul.d/standalone-jobs.yaml#L260
[3] https://review.opendev.org/q/topic:tripleo-ci-reduce

Change-Id: I5ae251a97d2fed7c8175497d80188f2868683908
---
 zuul.d/layout.yaml | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index b1ea9aa38a..4b31f3dc36 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -17,38 +17,6 @@
               - openstack-tox-pep8
         - tripleo-ci-centos-8-content-provider:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            vars: &multi_consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &deps_cprovider
-              - tripleo-ci-centos-8-content-provider
-            files:
-              - ci/environments/scenario007-multinode-containers.yaml
-              - ^(deployment|docker|puppet)/neutron-plugin-ml2.yaml #LP1765975
-              - ^(deployment|docker|puppet)/.*.*ovn.*$
-              - ^(deployment|docker|puppet)/.*tacker.*$
-              - ^ci/common/.*$
-              - ^environments\/.*.yaml
-              - ^deployed-server/.*$
-              - ^common/.*$
-              - zuul.d/*
-        - tripleo-ci-centos-8-scenario010-standalone:
-            vars: *multi_consumer_vars
-            dependencies: *deps_cprovider
-            files:
-              - ^(deployment|docker|puppet)/.*octavia.*$
-              - ^deployment/ceph-ansible.*$
-              - ^deployment/octavia/*$
-              - ci/environments/scenario010-standalone.yaml
-              - ^ci/common/.*$
-              - ^environments\/.*.yaml
-              - ^deployed-server/.*$
-              - ^network/endpoints/.*$
-              - ^common/.*$
-              - zuul.d/*
     gate:
       queue: tripleo
       jobs: