diff --git a/zuul.d/build-containers.yaml b/zuul.d/build-containers.yaml index 335d84464..9b1703f6d 100644 --- a/zuul.d/build-containers.yaml +++ b/zuul.d/build-containers.yaml @@ -7,18 +7,22 @@ check: jobs: - tripleo-build-containers-centos-7 + - tripleo-build-containers-centos-7-train - tripleo-build-containers-centos-7-stein - tripleo-build-containers-centos-7-rocky - tripleo-build-containers-centos-7-buildah + - tripleo-build-containers-centos-7-buildah-train - tripleo-build-containers-centos-7-buildah-stein gate: queue: tripleo jobs: - tripleo-build-containers-centos-7 + - tripleo-build-containers-centos-7-train - tripleo-build-containers-centos-7-stein - tripleo-build-containers-centos-7-rocky - tripleo-build-containers-centos-7-buildah - tripleo-build-containers-centos-7-buildah-stein + - tripleo-build-containers-centos-7-buildah-train - project-template: name: tripleo-build-containers-jobs @@ -32,6 +36,18 @@ - tripleo-build-containers-centos-7 - tripleo-build-containers-centos-7-buildah +- project-template: + name: tripleo-build-containers-jobs-train + check: + jobs: + - tripleo-build-containers-centos-7-train + - tripleo-build-containers-centos-7-buildah-train + gate: + queue: tripleo + jobs: + - tripleo-build-containers-centos-7-train + - tripleo-build-containers-centos-7-buildah-train + - project-template: name: tripleo-build-containers-jobs-stein check: @@ -61,6 +77,13 @@ branches: ^(?!stable/(pike|queens)).*$ voting: true +- job: + name: tripleo-build-containers-centos-7-train + parent: tripleo-build-containers-centos-7 + override-checkout: stable/train + vars: + branch_override: stable/train + - job: name: tripleo-build-containers-centos-7-stein parent: tripleo-build-containers-centos-7 @@ -83,6 +106,13 @@ vars: use_buildah: true +- job: + name: tripleo-build-containers-centos-7-buildah-train + parent: tripleo-build-containers-centos-7-buildah + override-checkout: stable/train + vars: + branch_override: stable/train + - job: name: tripleo-build-containers-centos-7-buildah-stein parent: tripleo-build-containers-centos-7-buildah diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index fbdd65eb8..5101830d6 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -57,6 +57,8 @@ files: - ^playbooks/tripleo-ci/.*$ - tripleo-ci-centos-7-standalone-upgrade-stein: + branches: stable/train + - tripleo-ci-centos-7-standalone-upgrade-train: branches: master - tripleo-ci-centos-7-containers-undercloud-minion: files: @@ -80,5 +82,7 @@ - ^scripts/emit_releases_file/.*$ - tripleo-buildimage-overcloud-full-centos-7: files: *build_images_files - - tripleo-ci-centos-7-standalone-upgrade-stein: + - tripleo-ci-centos-7-standalone-upgrade-train: branches: master + - tripleo-ci-centos-7-standalone-upgrade-stein: + branches: stable/train diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index 48232b7ed..dba388d55 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -76,6 +76,9 @@ irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-standalone-upgrade-stein: irrelevant-files: *standalone_ignored + - tripleo-ci-centos-7-standalone-upgrade-train: + irrelevant-files: *standalone_ignored + gate: queue: tripleo @@ -88,6 +91,8 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-standalone-upgrade-stein: irrelevant-files: *standalone_ignored + - tripleo-ci-centos-7-standalone-upgrade-train: + irrelevant-files: *standalone_ignored - project-template: name: tripleo-multinode-baremetal-full @@ -124,6 +129,8 @@ irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-standalone-upgrade-stein: irrelevant-files: *standalone_ignored + - tripleo-ci-centos-7-standalone-upgrade-train: + irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario001-standalone: irrelevant-files: *standalone_ignored - tripleo-ci-centos-7-scenario002-standalone: @@ -148,6 +155,8 @@ irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-standalone-upgrade-stein: irrelevant-files: *standalone_ignored + - tripleo-ci-centos-7-standalone-upgrade-train: + irrelevant-files: *standalone_ignored - project-template: name: tripleo-multinode-experimental @@ -164,6 +173,8 @@ name: tripleo-multinode-branchful check: jobs: + - tripleo-ci-centos-7-containers-multinode-train: + irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode-stein: irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode-rocky: @@ -172,6 +183,8 @@ irrelevant-files: *multinode_ignored gate: jobs: + - tripleo-ci-centos-7-containers-multinode-train: + irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode-stein: irrelevant-files: *multinode_ignored - tripleo-ci-centos-7-containers-multinode-rocky: @@ -192,7 +205,7 @@ - job: name: tripleo-ci-centos-7-containers-undercloud-minion parent: tripleo-ci-base-multinode - branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$ + branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train)).*$ voting: false vars: nodes: 1minion @@ -203,6 +216,20 @@ - undercloud-minion-setup - undercloud-minion-deploy +- job: + name: tripleo-ci-centos-7-containers-multinode-train + parent: tripleo-ci-base-multinode + timeout: 10800 + voting: true + branches: master + override-checkout: 'stable/train' + vars: + branch_override: 'stable/train' + nodes: 1ctlr + featureset: '010' + playbooks: + - multinode.yml + - job: name: tripleo-ci-centos-7-containers-multinode-stein parent: tripleo-ci-base-multinode @@ -320,7 +347,7 @@ name: tripleo-ci-centos-7-scenario009-multinode-oooq-container parent: tripleo-ci-base-multinode voting: false - branches: ^(stable/(queens|rocky|stein)).*$ + branches: ^(stable/(queens|rocky|stein|train)).*$ vars: nodes: 1ctlr featureset: '033' @@ -329,7 +356,7 @@ name: tripleo-ci-centos-7-scenario010-multinode-oooq-container parent: tripleo-ci-base-multinode voting: false - branches: ^(stable/(queens|rocky|stein)).*$ + branches: ^(stable/(queens|rocky|stein|train)).*$ vars: nodes: 1ctlr featureset: '038' @@ -364,7 +391,7 @@ name: tripleo-ci-centos-7-scenario012-multinode-oooq-container parent: tripleo-ci-base-multinode voting: false - branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$ + branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$ vars: nodes: 1ctlr featureset: '054' diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml index 69b063784..aa218424f 100644 --- a/zuul.d/standalone-jobs.yaml +++ b/zuul.d/standalone-jobs.yaml @@ -64,7 +64,7 @@ parent: tripleo-ci-base-standalone-upgrade nodeset: single-centos-7-node voting: false - branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).* + branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).* vars: featureset: '056' irrelevant-files: @@ -89,6 +89,15 @@ vars: branch_override: 'stable/stein' +- job: + name: tripleo-ci-centos-7-standalone-upgrade-train + parent: tripleo-ci-centos-7-standalone-upgrade + voting: true + branches: ^(stable/(stein|train)).* + override-checkout: 'stable/train' + vars: + branch_override: 'stable/train' + - project-template: name: tripleo-standalone-scenarios-full check: @@ -353,6 +362,7 @@ - tripleo-ci-centos-7-standalone-rocky - tripleo-ci-centos-7-standalone-upgrade - tripleo-ci-centos-7-standalone-upgrade-stein + - tripleo-ci-centos-7-standalone-upgrade-train - tripleo-ci-centos-7-standalone gate: @@ -368,6 +378,7 @@ files: *scen4_files - tripleo-ci-centos-7-standalone-upgrade-stein + - tripleo-ci-centos-7-standalone-upgrade-train - tripleo-ci-centos-7-standalone - tripleo-ci-centos-7-scenario010-standalone: @@ -423,6 +434,9 @@ - tripleo-ci-centos-7-standalone-upgrade-stein: vars: force_non_periodic: true + - tripleo-ci-centos-7-standalone-upgrade-train: + vars: + force_non_periodic: true - tripleo-ci-centos-7-standalone: vars: force_non_periodic: true @@ -533,7 +547,7 @@ voting: false parent: tripleo-ci-base-standalone nodeset: single-centos-7-node - branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$ + branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$ vars: featureset: '052' featureset_override: @@ -576,7 +590,7 @@ voting: false parent: tripleo-ci-base-standalone nodeset: single-centos-7-node - branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$ + branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$ vars: featureset: '060' standalone_ceph: true