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]. Part of wider 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
e2b34a4669
commit
df4a39e3c8
|
@ -21,29 +21,18 @@
|
||||||
- openstack-tox-py36
|
- openstack-tox-py36
|
||||||
- openstack-tox-py37
|
- openstack-tox-py37
|
||||||
- tripleo-ci-centos-8-content-provider:
|
- tripleo-ci-centos-8-content-provider:
|
||||||
dependencies: &deps_unit_lint
|
dependencies:
|
||||||
- openstack-tox-pep8
|
- openstack-tox-pep8
|
||||||
- openstack-tox-py36
|
- openstack-tox-py36
|
||||||
- openstack-tox-py37
|
- openstack-tox-py37
|
||||||
- tripleo-ci-centos-8-containers-multinode:
|
|
||||||
vars: &multi_consumer_vars
|
|
||||||
consumer_job: true
|
|
||||||
build_container_images: false
|
|
||||||
remove_tags:
|
|
||||||
- build
|
|
||||||
dependencies: &deps_cprovider
|
|
||||||
- tripleo-ci-centos-8-content-provider
|
|
||||||
- tripleo-build-containers-ubi-8:
|
|
||||||
dependencies: *deps_unit_lint
|
|
||||||
files:
|
|
||||||
- ^tripleoclient/v1/tripleo_container_image.py$
|
|
||||||
- tripleo-ci-centos-8-containers-undercloud-minion:
|
- tripleo-ci-centos-8-containers-undercloud-minion:
|
||||||
vars: &sa_consumer_vars
|
vars:
|
||||||
consumer_job: true
|
consumer_job: true
|
||||||
build_container_images: false
|
build_container_images: false
|
||||||
remove_tags:
|
remove_tags:
|
||||||
- build
|
- build
|
||||||
dependencies: *deps_cprovider
|
dependencies:
|
||||||
|
- tripleo-ci-centos-8-content-provider
|
||||||
files:
|
files:
|
||||||
- ^config-generator/.*minion.*$
|
- ^config-generator/.*minion.*$
|
||||||
- ^tripleoclient/config/.*minion.*$
|
- ^tripleoclient/config/.*minion.*$
|
||||||
|
@ -53,7 +42,3 @@
|
||||||
queue: tripleo
|
queue: tripleo
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-pep8
|
- openstack-tox-pep8
|
||||||
- tripleo-build-containers-ubi-8:
|
|
||||||
dependencies: *deps_unit_lint
|
|
||||||
files:
|
|
||||||
- ^tripleoclient/v1/tripleo_container_image.py$
|
|
||||||
|
|
Loading…
Reference in New Issue