openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Simplify consumer job tags 

Use remove_tags to reduce chances of breaking jobs when tags
change. It also consolidates the consumer jobs to use the same
config.

Change-Id: Iea62b3435ccc8992974b5c3968431935d35b633e
This commit is contained in:
Rafael Folco 2020-10-27 12:42:58 -03:00 committed by Sagi Shnaidman
parent 80911871b8
commit fc41450682
1 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
zuul.d/layout.yaml
View File

@ -17,31 +17,6 @@
- openstack-tox-pep8
- tripleo-ci-centos-8-content-provider:
dependencies: *deps_unit_lint
- tripleo-ci-centos-7-containers-multinode:
vars: &multi_consumer_vars
consumer_job: true
build_container_images: false
remove_tags:
- build
dependencies: &deps_cprovider_c7
- tripleo-ci-centos-7-content-provider
- tripleo-ci-centos-8-containers-multinode:
vars: *multi_consumer_vars
dependencies: &deps_cprovider
- tripleo-ci-centos-8-content-provider
- tripleo-ci-centos-8-undercloud-containers:
vars: &undercloud_consumer_vars
consumer_job: true
remove_tags:
- build
dependencies: *deps_cprovider
- tripleo-ci-centos-8-standalone:
vars: &sa_consumer_vars
consumer_job: true
build_container_images: false
tags:
- standalone
dependencies: *deps_cprovider
- tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
voting: true
dependencies: *deps_unit_lint
@ -73,8 +48,13 @@
- ^network/endpoints/.*$
- zuul.d/*
- tripleo-ci-centos-8-scenario007-multinode-oooq-container:
vars: *multi_consumer_vars
dependencies: *deps_cprovider
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
@ -99,21 +79,6 @@
- ^network/endpoints/.*$
- ^common/.*$
- zuul.d/*
- tripleo-ci-centos-8-scenario001-standalone:
vars: *sa_consumer_vars
dependencies: *deps_cprovider
- tripleo-ci-centos-8-scenario002-standalone:
vars: *sa_consumer_vars
dependencies: *deps_cprovider
- tripleo-ci-centos-8-scenario003-standalone:
vars: *sa_consumer_vars
dependencies: *deps_cprovider
- tripleo-ci-centos-8-scenario004-standalone:
vars: *sa_consumer_vars
dependencies: *deps_cprovider
- tripleo-ci-centos-8-scenario012-standalone:
vars: *sa_consumer_vars
dependencies: *deps_cprovider
- tripleo-ci-centos-7-containerized-undercloud-upgrades:
voting: false
dependencies: *deps_unit_lint