From 19f8dfd91499d11bc91ff48b832820e498563705 Mon Sep 17 00:00:00 2001 From: Rafael Folco Date: Fri, 16 Oct 2020 17:31:28 -0300 Subject: [PATCH] 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. - Nuke c7 jobs from layout (master). - Remove dup jobs from layout already defined in templates. - Remove content providers from layout (not in use by any job). - Fix zuul graph freeze issue. - Make periodic and branchful jobs consumers of content provider jobs. - Move periodic jobs to its own yaml file. - Remove scenario jobs from periodic template queue (overkill). Change-Id: Iec63f53364924288c25d79298204a7b570221464 --- zuul.d/layout.yaml | 45 ---------------------------- zuul.d/multinode-jobs.yaml | 20 +++++-------- zuul.d/periodic.yaml | 61 +++++++++++++++++++++++++++++++------- 3 files changed, 57 insertions(+), 69 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index d59a2d416..e159f26c6 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -16,7 +16,6 @@ check: jobs: - openstack-tox-linters - - tripleo-build-containers-ubi-8 - tripleo-tox-molecule: vars: tox_environment: @@ -34,50 +33,6 @@ vars: tox_environment: PYTEST_REQPASS: 84 - - - tripleo-ci-centos-7-scenario001-multinode-oooq-container: - 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: &multi_deps_c7 - - tripleo-ci-centos-7-content-provider - files: &multi_files_c7 - - ^playbooks/tripleo-ci/.*$ - - tripleo-ci-centos-7-scenario002-multinode-oooq-container: - vars: *multi_consumer_vars - files: *multi_files_c7 - dependencies: *multi_deps_c7 - - tripleo-ci-centos-7-scenario003-multinode-oooq-container: - vars: *multi_consumer_vars - files: *multi_files_c7 - dependencies: *multi_deps_c7 - - tripleo-ci-centos-7-scenario004-multinode-oooq-container: - vars: *multi_consumer_vars - files: *multi_files_c7 - dependencies: *multi_deps_c7 - - tripleo-ci-centos-7-scenario007-multinode-oooq-container: - vars: *multi_consumer_vars - files: *multi_files_c7 - dependencies: *multi_deps_c7 - - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades: - files: - - ^scripts/emit_releases_file/.*$ - - ^roles/run-test/.*$ - - ^roles/common/.*$ - - ^roles/tripleo-repos/.*$ - gate: queue: tripleo jobs: diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index d17529d84..733ceae5c 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -31,7 +31,6 @@ - ^playbooks/tripleo-buildcontainers/.*$ - ^playbooks/tripleo-buildimages/.*$ - ^vars/sova-patterns.yml$ - - zuul.d/layout.yaml - zuul.d/build-containers.yaml - zuul.d/build-image.yaml - zuul.d/standalone-jobs.yaml @@ -458,12 +457,12 @@ - tripleo-ci-centos-8-content-provider-train - tripleo-ci-centos-7-content-provider-train - tripleo-ci-centos-7-content-provider-queens - - tripleo-ci-centos-8-containers-multinode-ussuri: + - tripleo-ci-centos-8-containers-multinode-ussuri: &multi_consumer_job_ussuri irrelevant-files: *multinode_ignored vars: *multi_consumer_vars dependencies: - tripleo-ci-centos-8-content-provider-ussuri - - tripleo-ci-centos-8-containers-multinode-train: + - tripleo-ci-centos-8-containers-multinode-train: &multi_consumer_job_train irrelevant-files: *multinode_ignored vars: *multi_consumer_vars dependencies: @@ -482,16 +481,8 @@ jobs: - tripleo-ci-centos-8-content-provider-ussuri - tripleo-ci-centos-8-content-provider-train - - tripleo-ci-centos-8-containers-multinode-ussuri: - irrelevant-files: *multinode_ignored - vars: *multi_consumer_vars - dependencies: - - tripleo-ci-centos-8-content-provider-ussuri - - tripleo-ci-centos-8-containers-multinode-train: - irrelevant-files: *multinode_ignored - vars: *multi_consumer_vars - dependencies: - - tripleo-ci-centos-8-content-provider-train + - tripleo-ci-centos-8-containers-multinode-ussuri: *multi_consumer_job_ussuri + - tripleo-ci-centos-8-containers-multinode-train: *multi_consumer_job_train periodic: jobs: - tripleo-ci-centos-8-containers-multinode-ussuri: @@ -520,6 +511,9 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode-queens: irrelevant-files: *multinode_ignored + vars: *multi_consumer_vars + dependencies: + - tripleo-ci-centos-7-content-provider-queens - project-template: name: tripleo-multinode-tripleoci diff --git a/zuul.d/periodic.yaml b/zuul.d/periodic.yaml index 4414c0286..0652fcbbd 100644 --- a/zuul.d/periodic.yaml +++ b/zuul.d/periodic.yaml @@ -6,21 +6,60 @@ - tripleo-ci-centos-8-containers-multinode: vars: force_non_periodic: true - - tripleo-ci-centos-8-scenario001-standalone: + consumer_job: true + build_container_images: false + remove_tags: + - build + dependencies: + - tripleo-ci-centos-8-content-provider + - tripleo-ci-centos-7-standalone-upgrade-stein: vars: force_non_periodic: true - - tripleo-ci-centos-8-scenario002-standalone: - vars: - force_non_periodic: true - - tripleo-ci-centos-8-scenario003-standalone: - vars: - force_non_periodic: true - - tripleo-ci-centos-8-scenario004-standalone: - vars: - force_non_periodic: true - - tripleo-ci-centos-8-scenario010-standalone: + - tripleo-ci-centos-7-standalone-upgrade-train: vars: force_non_periodic: true - tripleo-ci-centos-8-standalone: vars: force_non_periodic: true + consumer_job: true + build_container_images: false + remove_tags: + - build + dependencies: + - tripleo-ci-centos-8-content-provider + +- project-template: + name: tripleo-multinode-branchful + periodic: + jobs: + - tripleo-ci-centos-8-content-provider-ussuri + - tripleo-ci-centos-8-content-provider-train + - tripleo-ci-centos-7-content-provider-train + - tripleo-ci-centos-7-content-provider-queens + - tripleo-ci-centos-8-containers-multinode-ussuri: + vars: &multi_consumer_vars_periodic + force_non_periodic: true + consumer_job: true + build_container_images: false + remove_tags: + - build + dependencies: + - tripleo-ci-centos-8-content-provider-ussuri + - tripleo-ci-centos-8-containers-multinode-train: + vars: *multi_consumer_vars_periodic + dependencies: + - tripleo-ci-centos-8-content-provider-train + - tripleo-ci-centos-7-containers-multinode-train: + vars: *multi_consumer_vars_periodic + dependencies: + - tripleo-ci-centos-7-content-provider-train + - tripleo-ci-centos-7-containers-multinode-stein: + vars: + force_non_periodic: true + - tripleo-ci-centos-7-containers-multinode-rocky: + vars: + force_non_periodic: true + - tripleo-ci-centos-7-containers-multinode-queens: + vars: *multi_consumer_vars_periodic + dependencies: + - tripleo-ci-centos-7-content-provider-queens