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 (cherry picked from commit7746b2e57f
)
This commit is contained in:
parent
1d9ec5c3a3
commit
66ec280447
|
@ -18,55 +18,14 @@
|
||||||
- openstack-tox-pep8
|
- openstack-tox-pep8
|
||||||
- openstack-tox-py36
|
- openstack-tox-py36
|
||||||
- openstack-tox-py38
|
- openstack-tox-py38
|
||||||
- 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:
|
- tripleo-ci-centos-8-containers-undercloud-minion:
|
||||||
vars: &undercloud_consumer_vars
|
vars:
|
||||||
consumer_job: true
|
consumer_job: true
|
||||||
tags:
|
build_container_images: false
|
||||||
- undercloud-setup
|
remove_tags:
|
||||||
- undercloud-scripts
|
- build
|
||||||
- undercloud-install
|
dependencies:
|
||||||
- undercloud-validate
|
- tripleo-ci-centos-8-content-provider
|
||||||
dependencies: *cprovider
|
|
||||||
files:
|
files:
|
||||||
- ^config-generator/.*minion.*$
|
- ^config-generator/.*minion.*$
|
||||||
- ^tripleoclient/config/.*minion.*$
|
- ^tripleoclient/config/.*minion.*$
|
||||||
|
|
Loading…
Reference in New Issue