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] 67a58a4378/zuul.d/multinode-jobs.yaml (L71-L85)
[2] https://review.opendev.org/q/topic:tripleo-ci-reduce

Change-Id: I7c4ba85cbc1525079a94cb76aa9576b24f1d0fbb
This commit is contained in:
Marios Andreou 2021-03-08 15:42:37 +02:00
parent 03e587dbca
commit 74c42829eb
1 changed files with 6 additions and 47 deletions

View File

@ -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.*$