diff options
| author | Rodolfo Alonso Hernandez <ralonsoh@redhat.com> | 2023-03-24 12:27:03 +0100 |
|---|---|---|
| committer | Rodolfo Alonso Hernandez <ralonsoh@redhat.com> | 2023-04-04 10:07:17 +0200 |
| commit | 7073410be3e9b89dace4cb4b47ed1c5c00587474 (patch) | |
| tree | d4c64c835243a755eda9fe1be2dbcb73783557f5 /zuul.d | |
| parent | 78f43ea2ddf06ae5d8c5d5daa1c4b95d2a28a1ff (diff) | |
| download | neutron-7073410be3e9b89dace4cb4b47ed1c5c00587474.tar.gz | |
Bump skip-level lower version to stable/zed
During the Bobcat release, the lower version of grenade "skip-level"
jobs should be Zed.
A new template is created: "neutron-skip-level-jobs". This template
defines the queues the "skip-level" jobs are executed:
* check
* experimental
* periodic
During this release (non SLURP), these jobs are not executed in the
"check" queue.
Change-Id: I6861fb0cdc5e4a6529b23be6cc29f7fdad954a6f
Diffstat (limited to 'zuul.d')
| -rw-r--r-- | zuul.d/grenade.yaml | 18 | ||||
| -rw-r--r-- | zuul.d/job-templates.yaml | 19 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 5 |
3 files changed, 26 insertions, 16 deletions
diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index e27c1aa186..e1146edd4b 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -370,14 +370,11 @@ description: | Grenade job that skips a release, validating that deployers can skip specific releases as prescribed by our process. - # See background from gmann: - # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml - branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$ vars: # Move this forward when master changes to a new skip-level-allowed - # target release. Right now, this is xena because master is zed. - # When master is A, this should become yoga, and so forth. - grenade_from_branch: stable/yoga + # target release. Right now, this is Zed because master is Bobcat (2023.2). + # When master is C, this should become Antelope (2023.1), and so forth. + grenade_from_branch: stable/zed grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True @@ -387,13 +384,10 @@ description: | Grenade job that skips a release, validating that deployers can skip specific releases as prescribed by our process. - # See background from gmann: - # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml - branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$ vars: # Move this forward when master changes to a new skip-level-allowed - # target release. Right now, this is xena because master is zed. - # When master is A, this should become yoga, and so forth. - grenade_from_branch: stable/yoga + # target release. Right now, this is Zed because master is Bobcat (2023.2). + # When master is C, this should become Antelope (2023.1), and so forth. + grenade_from_branch: stable/zed grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index 70b2501902..676c3ed643 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -135,3 +135,22 @@ - neutron-functional-with-oslo-master - neutron-ovs-tempest-with-oslo-master - neutron-ovn-tempest-ovs-release-with-oslo-master + +- project-template: + name: neutron-skip-level-jobs + # NOTE(ralonsoh): during Bobcat (non SLURP release), these + # jobs are not executed in the "check" queue. + #check: + # jobs: + # - neutron-ovs-grenade-multinode-skip-level: + # voting: false + # - neutron-ovn-grenade-multinode-skip-level: + # voting: false + periodic: + jobs: + - neutron-ovs-grenade-multinode-skip-level + - neutron-ovn-grenade-multinode-skip-level + experimental: + jobs: + - neutron-ovs-grenade-multinode-skip-level + - neutron-ovn-grenade-multinode-skip-level diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ba9f2f9a10..ec93017b5c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -15,15 +15,12 @@ - neutron-experimental-jobs - neutron-periodic-jobs - neutron-tox-override-jobs + - neutron-skip-level-jobs check: jobs: - neutron-functional-with-uwsgi - neutron-fullstack-with-uwsgi - neutron-ovs-grenade-multinode - - neutron-ovs-grenade-multinode-skip-level: - voting: false - - neutron-ovn-grenade-multinode-skip-level: - voting: false - neutron-ovs-grenade-dvr-multinode - neutron-ovs-tempest-multinode-full - neutron-ovs-tempest-dvr-ha-multinode-full |