Updates of jobs config for 2024.2
This is based on Takashi's patches[1], but squashed and adjusted because
Zed is now unmaintained and devstack with Ubuntu focal will no longer
work. From now on we only test stable branches.
[1]: https://review.opendev.org/c/openstack/octavia-tempest-plugin/+/915853
Co-Authored-By: Takashi Kajinami <kajinamit@oss.nttdata.com>
Change-Id: I068912ad2004d6bed7f7b31e4b7ad4e15265f8a5
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b431af6..04c3db7 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -554,6 +554,12 @@
USE_PYTHON3: False
- job:
+ name: octavia-v2-dsvm-noop-api-stable-2024-1
+ parent: octavia-v2-dsvm-noop-api
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.1
+
+- job:
name: octavia-v2-dsvm-noop-api-stable-2023-2
parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-jammy
@@ -593,23 +599,11 @@
name: octavia-v2-dsvm-scenario
parent: octavia-v2-dsvm-scenario-base
branches:
- regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ regex: ^(unmaintained/)
negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
- name: octavia-v2-dsvm-scenario
- parent: octavia-v2-dsvm-scenario-base
- branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
- nodeset: octavia-single-node-ubuntu-focal
-
-- job:
- name: octavia-v2-dsvm-scenario
- parent: octavia-v2-dsvm-scenario-base
- branches: ^(stable/(train|ussuri))
- nodeset: octavia-single-node-ubuntu-bionic
-
-- job:
name: octavia-v2-dsvm-scenario-traffic-ops
parent: octavia-v2-dsvm-scenario
vars:
@@ -652,10 +646,28 @@
override-checkout: 2.30.0
- job:
+ name: octavia-v2-dsvm-scenario-stable-2024-1
+ parent: octavia-v2-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.1
+
+- job:
+ name: octavia-v2-dsvm-scenario-traffic-ops-stable-2024-1
+ parent: octavia-v2-dsvm-scenario-stable-2024-1
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-1
+ parent: octavia-v2-dsvm-scenario-stable-2024-1
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
name: octavia-v2-dsvm-scenario-stable-2023-2
parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2023.1
+ override-checkout: stable/2023.2
- job:
name: octavia-v2-dsvm-scenario-traffic-ops-stable-2023-2
@@ -877,33 +889,21 @@
name: octavia-v2-dsvm-tls-barbican
parent: octavia-v2-dsvm-tls-barbican-base
branches:
- regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ regex: ^(unmaintained/)
negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
- name: octavia-v2-dsvm-tls-barbican
- parent: octavia-v2-dsvm-tls-barbican-base
- branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
- nodeset: octavia-single-node-ubuntu-focal
-
-- job:
- name: octavia-v2-dsvm-tls-barbican
- parent: octavia-v2-dsvm-tls-barbican-base
- branches: ^(stable/(train|ussuri))
- nodeset: octavia-single-node-ubuntu-bionic
- required-projects:
- - openstack/barbican
- - openstack/diskimage-builder
- - openstack/python-barbicanclient
- - name: openstack/barbican-tempest-plugin
- override-checkout: 1.6.0
+ name: octavia-v2-dsvm-tls-barbican-stable-2024-1
+ parent: octavia-v2-dsvm-tls-barbican
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.1
- job:
name: octavia-v2-dsvm-tls-barbican-stable-2023-2
parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2023.1
+ override-checkout: stable/2023.2
- job:
name: octavia-v2-dsvm-tls-barbican-stable-2023-1
@@ -911,13 +911,6 @@
nodeset: octavia-single-node-ubuntu-jammy
override-checkout: stable/2023.1
-# Still used by barbican
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-train
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/train
-
- job:
name: octavia-v2-dsvm-spare-pool
parent: octavia-v2-dsvm-scenario
@@ -944,12 +937,6 @@
override-checkout: 2.30.0
- job:
- name: octavia-v2-dsvm-spare-pool-stable-wallaby
- parent: octavia-v2-dsvm-spare-pool
- nodeset: octavia-single-node-ubuntu-focal
- override-checkout: stable/wallaby
-
-- job:
name: octavia-v2-dsvm-cinder-amphora
parent: octavia-v2-dsvm-scenario
required-projects:
@@ -1082,21 +1069,15 @@
name: octavia-v2-act-stdby-dsvm-scenario
parent: octavia-v2-act-stdby-dsvm-scenario-base
branches:
- regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ regex: ^(unmaintained/)
negate: true
nodeset: octavia-single-node-ubuntu-jammy
- job:
- name: octavia-v2-act-stdby-dsvm-scenario
- parent: octavia-v2-act-stdby-dsvm-scenario-base
- branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
- nodeset: octavia-single-node-ubuntu-focal
-
-- job:
- name: octavia-v2-act-stdby-dsvm-scenario
- parent: octavia-v2-act-stdby-dsvm-scenario-base
- branches: ^(stable/(train|ussuri))
- nodeset: octavia-single-node-ubuntu-bionic
+ name: octavia-v2-act-stdby-dsvm-scenario-stable-2024-1
+ parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.1
- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-2023-2