From e6efb9d61d273b5cfbc9f95df69c6f2d79509b18 Mon Sep 17 00:00:00 2001 From: Rafael Folco Date: Mon, 26 Oct 2020 14:15:02 -0300 Subject: [PATCH] [c7-train] Switch c7 jobs to content provider This change switches c7 jobs to the content provider dependency relation so the jobs share the produced artifacts. It also removes c7-standalone-upgrade job per [1]. [1] https://review.opendev.org/#/c/759446/ Change-Id: I8c9616bd2498792bf28420be49471959ceb06397 --- zuul.d/layout.yaml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index b5a5d3b..f5596f5 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -12,32 +12,45 @@ - openstack-tox-py27 - openstack-tox-py36 - openstack-tox-py37 - - tripleo-ci-centos-7-containers-multinode: + - tripleo-ci-centos-7-content-provider: dependencies: &deps_unit_lint - openstack-tox-pep8 - openstack-tox-py27 - openstack-tox-py36 - openstack-tox-py37 + - tripleo-ci-centos-7-containers-multinode: + vars: &consumer_vars + consumer_job: true + build_container_images: false + remove_tags: + - build + dependencies: &deps_cprovider + - tripleo-ci-centos-7-content-provider - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades: dependencies: *deps_unit_lint - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates: dependencies: *deps_unit_lint - tripleo-ci-centos-7-scenario007-multinode-oooq-container: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario009-multinode-oooq-container: - dependencies: *deps_unit_lint - - tripleo-ci-centos-7-standalone-upgrade: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario001-standalone: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario002-standalone: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario003-standalone: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario004-standalone: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider - tripleo-ci-centos-7-scenario012-standalone: - dependencies: *deps_unit_lint + vars: *consumer_vars + dependencies: *deps_cprovider # TODO, add tripleo-ci-centos-8-containerized-undercloud-upgrades to check and gate # to replace tripleo-ci-centos-7-containerized-undercloud-upgrades