Merge "Fix branch regex for unmaintained branch model"

This commit is contained in:
Zuul 2024-03-18 01:14:36 +00:00 committed by Gerrit Code Review
commit 905da972c9
1 changed files with 23 additions and 26 deletions

View File

@ -65,8 +65,8 @@
# This job version is to use the 'full' tox env which # This job version is to use the 'full' tox env which
# is available for stable/ussuri to stable/wallaby also. # is available for stable/ussuri to stable/wallaby also.
branches: branches:
- stable/victoria - ^.*/victoria
- stable/wallaby - ^.*/wallaby
description: | description: |
Base integration test with Neutron networking, horizon, swift enable, Base integration test with Neutron networking, horizon, swift enable,
and py3. and py3.
@ -94,11 +94,11 @@
nodeset: openstack-two-node-focal nodeset: openstack-two-node-focal
# This job runs on Focal and supposed to run until stable/zed. # This job runs on Focal and supposed to run until stable/zed.
branches: branches:
- stable/victoria - ^.*/victoria
- stable/wallaby - ^.*/wallaby
- stable/xena - ^.*/xena
- unmaintained/yoga - ^.*/yoga
- stable/zed - ^.*/zed
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: true USE_PYTHON3: true
@ -117,11 +117,11 @@
nodeset: openstack-two-node-focal nodeset: openstack-two-node-focal
# This job runs on Focal and on python2. This is for stable/victoria to stable/zed. # This job runs on Focal and on python2. This is for stable/victoria to stable/zed.
branches: branches:
- stable/victoria - ^.*/victoria
- stable/wallaby - ^.*/wallaby
- stable/xena - ^.*/xena
- unmaintained/yoga - ^.*/yoga
- stable/zed - ^.*/zed
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -136,8 +136,8 @@
# This job version is to use the 'slow-serial' tox env for # This job version is to use the 'slow-serial' tox env for
# the stable/ussuri to stable/wallaby testing. # the stable/ussuri to stable/wallaby testing.
branches: branches:
- stable/victoria - ^.*/victoria
- stable/wallaby - ^.*/wallaby
vars: vars:
tox_envlist: slow-serial tox_envlist: slow-serial
@ -152,12 +152,9 @@
# This job is not used after stable/xena and can be # This job is not used after stable/xena and can be
# removed once stable/xena is EOL. # removed once stable/xena is EOL.
branches: branches:
- stable/stein - ^.*/victoria
- stable/train - ^.*/wallaby
- stable/ussuri - ^.*/xena
- stable/victoria
- stable/wallaby
- stable/xena
- job: - job:
name: tempest-integrated-compute-centos-8-stream name: tempest-integrated-compute-centos-8-stream
@ -166,9 +163,9 @@
voting: false voting: false
nodeset: devstack-single-node-centos-8-stream nodeset: devstack-single-node-centos-8-stream
branches: branches:
- stable/wallaby - ^.*/wallaby
- stable/xena - ^.*/xena
- unmaintained/yoga - ^.*/yoga
description: | description: |
This job runs integration tests for compute. This is This job runs integration tests for compute. This is
subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests) subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests)
@ -185,9 +182,9 @@
# TODO(gmann): Make this job non voting until bug#1957941 if fixed. # TODO(gmann): Make this job non voting until bug#1957941 if fixed.
voting: false voting: false
branches: branches:
- stable/wallaby - ^.*/wallaby
- stable/xena - ^.*/xena
- unmaintained/yoga - ^.*/yoga
nodeset: devstack-single-node-centos-8-stream nodeset: devstack-single-node-centos-8-stream
description: | description: |
Base integration test with Neutron networking and py36 running Base integration test with Neutron networking and py36 running