commit c71919c7f8ae7f9750395508f64c92c19160789f Author: Rafael Folco Date: Wed Oct 7 13:53:14 2020 -0300 Switch to content provider jobs/templates This change switches templates and jobs to the content provider dependency relation so the jobs share the produced artifacts. Depends-On: https://review.opendev.org/#/c/756128 Change-Id: Idd41ff1203181aeff71d672d01e077a4aef659d4 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index d0ee8e3..b04685a 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -6,6 +6,7 @@ - openstack-python3-victoria-jobs check: jobs: + - tripleo-ci-centos-8-content-provider - openstack-tox-linters: &tripleo-linters nodeset: centos-8 - openstack-tox-docs: &tripleo-docs @@ -15,8 +16,24 @@ - ^README.rst - ^requirements.txt - tripleo-ci-centos-8-containers-multinode: &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: &deps - openstack-tox-linters + - tripleo-ci-centos-8-content-provider files: &containers_files - ^tripleo_ansible/.* irrelevant-files: &irrelevant_scenario_files @@ -32,18 +49,32 @@ - ^tripleo_ansible/roles/test_deps/.* - ^zuul.d/.* - tripleo-ci-centos-8-standalone: &basic_standalone + vars: &sa_consumer_vars + consumer_job: true + build_container_images: false + tags: + - standalone dependencies: *deps files: *containers_files irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion + vars: &undercloud_consumer_vars + consumer_job: true + tags: + - undercloud-setup + - undercloud-scripts + - undercloud-install + - undercloud-validate dependencies: *deps files: *containers_files irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-undercloud-containers: &undercloud_containers + vars: *undercloud_consumer_vars dependencies: *deps files: *containers_files irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-scenario001-standalone: &scenario001 + vars: *sa_consumer_vars dependencies: *deps files: - ^tripleo_ansible/roles/tripleo_ceph_.*/.* @@ -52,12 +83,14 @@ - ^setup.* irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-scenario002-standalone: &scenario002 + vars: *sa_consumer_vars dependencies: *deps files: - ^tripleo_ansible/roles/tripleo_hieradata/.* - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.* irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-scenario003-standalone: &scenario003 + vars: *sa_consumer_vars dependencies: *deps files: - ^tripleo_ansible/roles/tripleo_create_admin/.* @@ -65,17 +98,20 @@ - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.* irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-scenario004-standalone: &scenario004 + vars: *sa_consumer_vars dependencies: *deps files: - ^tripleo_ansible/roles/tripleo_ceph_.*/.* irrelevant-files: *irrelevant_scenario_files - tripleo-ci-centos-8-scenario010-standalone: &scenario010 + vars: *sa_consumer_vars dependencies: *deps files: - ^tripleo_ansible/roles/octavia_.*/.* irrelevant-files: *irrelevant_scenario_files gate: jobs: + - tripleo-ci-centos-8-content-provider - openstack-tox-linters: *tripleo-linters - openstack-tox-docs: *tripleo-docs - tripleo-ci-centos-8-containers-multinode: *containers_multinode