Merge "Updates of jobs config for 2024.2"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c3aa161..d43876b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -599,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:
@@ -901,27 +889,15 @@
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-2024-1
@@ -941,13 +917,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
@@ -974,12 +943,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:
@@ -1112,21 +1075,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-2024-1
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index dd854df..f47fae7 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -15,6 +15,8 @@
- octavia-v2-dsvm-noop-api-keystone-default-roles
- octavia-v2-dsvm-scenario-traffic-ops
- octavia-v2-dsvm-scenario-non-traffic-ops
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-2024-1
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-1
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-2
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-2
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1