From bda6e1a61a846890c9cc39d0bc91952e9c6deb8f Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Mon, 7 Feb 2022 13:00:51 +0200 Subject: [PATCH] Centos8 master jobs teardown - c8 on train/ussuri/victoria/wallaby This adjusts branches: match for the centos8 jobs so we avoid running these for master. C8 jobs will only run on train ussuri victoria and wallaby branches. The master branch will be c9 only moving forward. See [1] for related patches that depends-on this across the tripleo repos. See [2] for related dummy nodeset required for zuul 3rd party on this review. [1] https://review.opendev.org/q/topic:c8_teardown_master [2] https://review.rdoproject.org/r/c/rdo-jobs/+/39045 Change-Id: If62f83de171de4e7651b58b70c31bea005710c71 --- zuul.d/build-containers.yaml | 2 +- zuul.d/build-image.yaml | 6 +++--- zuul.d/content-provider.yaml | 1 + zuul.d/layout.yaml | 3 --- zuul.d/multinode-jobs.yaml | 4 ++-- zuul.d/standalone-jobs.yaml | 23 ++++++++++++++++++----- zuul.d/undercloud-jobs.yaml | 2 +- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/zuul.d/build-containers.yaml b/zuul.d/build-containers.yaml index 521290e24..f54384945 100644 --- a/zuul.d/build-containers.yaml +++ b/zuul.d/build-containers.yaml @@ -178,7 +178,7 @@ - job: name: tripleo-build-containers-ubi-8 parent: tripleo-build-containers-ubi-8-base - branches: ^(?!stable/(pike|queens|stein|train|ussuri)).*$ + branches: master # only wired up for tripleo-repos voting: true diff --git a/zuul.d/build-image.yaml b/zuul.d/build-image.yaml index da85f5c70..968b54eb3 100644 --- a/zuul.d/build-image.yaml +++ b/zuul.d/build-image.yaml @@ -221,7 +221,7 @@ - job: name: tripleo-buildimage-ironic-python-agent-centos-8 parent: tripleo-build-images-base-centos-8 - branches: ^(?!stable/(queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ vars: tripleo_image_type: ironic-python-agent irrelevant-files: @@ -231,7 +231,7 @@ - job: name: tripleo-buildimage-overcloud-full-centos-8 parent: tripleo-build-images-base-centos-8 - branches: ^(?!stable/(queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ vars: tripleo_image_type: overcloud-full irrelevant-files: @@ -251,7 +251,7 @@ - job: name: tripleo-buildimage-overcloud-hardened-uefi-full-centos-8 parent: tripleo-build-images-base-centos-8 - branches: ^(master|stable/wallaby).*$ + branches: ^stable/wallaby$ vars: tripleo_image_type: overcloud-hardened-uefi-full irrelevant-files: diff --git a/zuul.d/content-provider.yaml b/zuul.d/content-provider.yaml index 6ca54e8f6..f8fa9c982 100644 --- a/zuul.d/content-provider.yaml +++ b/zuul.d/content-provider.yaml @@ -10,6 +10,7 @@ - job: name: tripleo-ci-centos-8-content-provider parent: tripleo-ci-base-standalone-centos-8 + # branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$ required-projects: - opendev.org/openstack/tripleo-common diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index e8c854414..c0eea3479 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -35,9 +35,6 @@ tox_environment: PYTEST_REQPASS: 84 - openstack-tox-py39: *tox-py - - tripleo-ci-centos-8-content-provider: - dependencies: - - openstack-tox-linters - tripleo-ci-centos-9-content-provider: dependencies: - openstack-tox-linters diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index e4a34da1a..c5a61d3cd 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -237,7 +237,7 @@ - job: name: tripleo-ci-centos-8-containers-multinode parent: tripleo-ci-base-multinode-centos-8 - branches: ^(?!stable/(queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ voting: true vars: nodes: 1ctlr @@ -318,7 +318,7 @@ - job: name: tripleo-ci-centos-8-scenario007-multinode-oooq-container parent: tripleo-ci-base-multinode-centos-8 - branches: ^(?!stable/(queens|stein|train|ussuri)).*$ + branches: ^(stable/(victoria|wallaby)).*$ vars: nodes: 1ctlr featureset: '030' diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml index a5aefc503..bf0a7576e 100644 --- a/zuul.d/standalone-jobs.yaml +++ b/zuul.d/standalone-jobs.yaml @@ -33,7 +33,7 @@ - job: name: tripleo-ci-centos-8-standalone parent: tripleo-ci-base-standalone-centos-8 - branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ vars: featureset: '052' irrelevant-files: @@ -82,6 +82,7 @@ - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-9-content-provider - tripleo-ci-centos-8-scenario001-standalone: + branches: &no_master_c8 ^(stable/(train|ussuri|victoria|wallaby)).*$ files: &scen1_files # tripleo-common - ^container-images/tcib/base/collectd.*$ @@ -150,6 +151,7 @@ dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario002-standalone: + branches: *no_master_c8 files: &scen2_files # tripleo-heat-templates - ^((docker|puppet)/services|deployment)/.*aodh.*$ @@ -186,6 +188,7 @@ dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario003-standalone: + branches: *no_master_c8 files: &scen3_files # tripleo-common - ^container-images/tcib/base/os/designate.*$ @@ -215,6 +218,7 @@ dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario004-standalone: + branches: *no_master_c8 files: &scen4_files # tripleo-common - ^container-images/tcib/base/os/manila.*$ @@ -236,6 +240,7 @@ dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario007-standalone: + branches: *no_master_c8 files: &scen7_files # tripleo-common - ^container-images/tcib/base/os/neutron.*$ @@ -248,6 +253,7 @@ dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario010-standalone: &scen10_all + branches: *no_master_c8 files: &scen10_files # tripleo-common - ^container-images/tcib/base/os/octavia.*$ @@ -292,6 +298,7 @@ - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-victoria: *scen10_all - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-wallaby: *scen10_all - tripleo-ci-centos-8-scenario012-standalone: + branches: *no_master_c8 files: &scen12_files # tripleo-heat-templates - ^(docker/services|deployment)/glance.*$ @@ -344,26 +351,31 @@ - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-9-content-provider - tripleo-ci-centos-8-scenario001-standalone: + branches: *no_master_c8 files: *scen1_files vars: *consumer_vars dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario002-standalone: + branches: *no_master_c8 files: *scen2_files vars: *consumer_vars dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario003-standalone: + branches: *no_master_c8 files: *scen3_files vars: *consumer_vars dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario004-standalone: + branches: *no_master_c8 files: *scen4_files vars: *consumer_vars dependencies: - tripleo-ci-centos-8-content-provider - tripleo-ci-centos-8-scenario007-standalone: + branches: *no_master_c8 files: *scen7_files vars: *consumer_vars dependencies: @@ -379,6 +391,7 @@ - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-victoria: *scen10_all - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-wallaby: *scen10_all - tripleo-ci-centos-8-scenario012-standalone: + branches: *no_master_c8 files: *scen12_files vars: *consumer_vars dependencies: @@ -558,7 +571,7 @@ name: tripleo-ci-centos-8-scenario012-standalone voting: true parent: tripleo-ci-base-standalone-centos-8 - branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ vars: featureset: '060' standalone_ceph: true @@ -597,7 +610,7 @@ name: tripleo-ci-centos-8-scenario000-standalone voting: true parent: tripleo-ci-base-standalone-centos-8 - branches: ^(?!stable/(newton|ocata|pike|queens|stein|ussuri|victoria)).*$ + branches: ^(stable/(train|wallaby)).*$ - job: name: tripleo-ci-centos-8-scenario000-standalone-options @@ -943,7 +956,7 @@ parent: tripleo-ci-base-standalone-centos-8 voting: true nodeset: two-centos-8-nodes - branches: ^(?!stable/(newton|ocata|pike|queens|stein|train)).*$ + branches: ^(stable/(ussuri|victoria|wallaby)).*$ required-projects: - opendev.org/x/tripleo-ipa roles: @@ -974,7 +987,7 @@ - job: name: tripleo-ci-centos-8-repoclosure parent: tripleo-ci-base-standalone-centos-8 - branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$ + branches: master # this is only wired up in t-q-e vars: featureset: '052' repoclosure: true diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml index 6ac09627e..7ef1d4c88 100644 --- a/zuul.d/undercloud-jobs.yaml +++ b/zuul.d/undercloud-jobs.yaml @@ -93,7 +93,7 @@ - job: name: tripleo-ci-centos-8-undercloud-containers parent: tripleo-ci-undercloud-content-consumer-centos-8 - branches: ^(?!stable/(newton|ocata|pike|queens|stein)).*$ + branches: ^(stable/(train|ussuri|victoria|wallaby)).*$ voting: true vars: featureset: '027'