diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 303dc66a..6065d6dd 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -587,7 +587,7 @@ name: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario-base branches: - regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed)) + regex: ^(stable/(victoria|wallaby|xena|yoga|zed)) negate: true nodeset: octavia-single-node-ubuntu-jammy @@ -597,12 +597,6 @@ 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 @@ -857,7 +851,7 @@ name: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican-base branches: - regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed)) + regex: ^(stable/(victoria|wallaby|xena|yoga|zed)) negate: true nodeset: octavia-single-node-ubuntu-jammy @@ -867,18 +861,6 @@ 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 - - job: name: octavia-v2-dsvm-tls-barbican-stable-2023-2 parent: octavia-v2-dsvm-tls-barbican @@ -897,13 +879,6 @@ nodeset: octavia-single-node-ubuntu-focal override-checkout: stable/zed -# 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 @@ -1068,7 +1043,7 @@ 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: ^(stable/(victoria|wallaby|xena|yoga|zed)) negate: true nodeset: octavia-single-node-ubuntu-jammy @@ -1078,12 +1053,6 @@ 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 - - job: name: octavia-v2-act-stdby-dsvm-scenario-stable-2023-2 parent: octavia-v2-act-stdby-dsvm-scenario