diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 4718e9f4..45f5c72c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -559,18 +559,6 @@ nodeset: octavia-single-node-ubuntu-focal override-checkout: stable/yoga -- job: - name: octavia-v2-dsvm-noop-api-stable-xena - parent: octavia-v2-dsvm-noop-api - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/xena - -- job: - name: octavia-v2-dsvm-noop-api-stable-wallaby - parent: octavia-v2-dsvm-noop-api - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/wallaby - - job: name: octavia-v2-dsvm-scenario-base parent: octavia-dsvm-live-base @@ -709,43 +697,6 @@ vars: tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops) - -- job: - name: octavia-v2-dsvm-scenario-stable-xena - parent: octavia-v2-dsvm-scenario - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/xena - -- job: - name: octavia-v2-dsvm-scenario-traffic-ops-stable-xena - parent: octavia-v2-dsvm-scenario-stable-xena - vars: - tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops - -- job: - name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena - parent: octavia-v2-dsvm-scenario-stable-xena - vars: - tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops) - -- job: - name: octavia-v2-dsvm-scenario-stable-wallaby - parent: octavia-v2-dsvm-scenario - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/wallaby - -- job: - name: octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby - parent: octavia-v2-dsvm-scenario-stable-wallaby - vars: - tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops - -- job: - name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby - parent: octavia-v2-dsvm-scenario-stable-wallaby - vars: - tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops) - # Legacy jobs for the transition to the act-stdby two node jobs - job: name: octavia-v2-dsvm-scenario-two-node @@ -942,30 +893,7 @@ nodeset: octavia-single-node-ubuntu-focal override-checkout: stable/yoga -- job: - name: octavia-v2-dsvm-tls-barbican-stable-xena - parent: octavia-v2-dsvm-tls-barbican - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/xena - -- job: - name: octavia-v2-dsvm-tls-barbican-stable-wallaby - parent: octavia-v2-dsvm-tls-barbican - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/wallaby - -- job: - name: octavia-v2-dsvm-tls-barbican-stable-victoria - parent: octavia-v2-dsvm-tls-barbican - nodeset: octavia-single-node-ubuntu-focal - override-checkout: stable/victoria - -- job: - name: octavia-v2-dsvm-tls-barbican-stable-ussuri - parent: octavia-v2-dsvm-tls-barbican - nodeset: octavia-single-node-ubuntu-bionic - override-checkout: stable/ussuri - +# Still used by barbican - job: name: octavia-v2-dsvm-tls-barbican-stable-train parent: octavia-v2-dsvm-tls-barbican diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 710ae356..ebccc0f1 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -12,8 +12,6 @@ - octavia-v2-dsvm-noop-api-stable-2023-1 - octavia-v2-dsvm-noop-api-stable-zed - octavia-v2-dsvm-noop-api-stable-yoga - - octavia-v2-dsvm-noop-api-stable-xena - - octavia-v2-dsvm-noop-api-stable-wallaby - octavia-v2-dsvm-noop-api-keystone-default-roles - octavia-v2-dsvm-scenario-traffic-ops - octavia-v2-dsvm-scenario-non-traffic-ops @@ -23,20 +21,12 @@ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed - octavia-v2-dsvm-scenario-traffic-ops-stable-yoga - octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga - - octavia-v2-dsvm-scenario-traffic-ops-stable-xena - - octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena - - octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby - - octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby - octavia-v2-dsvm-tls-barbican - octavia-v2-dsvm-tls-barbican-stable-2023-1 - octavia-v2-dsvm-tls-barbican-stable-zed - octavia-v2-dsvm-tls-barbican-stable-yoga - - octavia-v2-dsvm-tls-barbican-stable-xena - - octavia-v2-dsvm-tls-barbican-stable-wallaby - octavia-v2-dsvm-scenario-ipv6-only: voting: false - - octavia-v2-dsvm-scenario-centos-8-stream: - voting: false - octavia-v2-dsvm-scenario-centos-9-stream-traffic-ops: voting: false - octavia-v2-dsvm-scenario-centos-9-stream-non-traffic-ops: @@ -51,12 +41,6 @@ voting: false - octavia-v2-act-stdby-dsvm-scenario-stable-yoga: voting: false - - octavia-v2-act-stdby-dsvm-scenario-stable-xena: - voting: false - - octavia-v2-act-stdby-dsvm-scenario-stable-wallaby: - voting: false - - octavia-v2-dsvm-spare-pool-stable-wallaby: - voting: false - octavia-v2-dsvm-cinder-amphora: voting: false # Third party provider jobs @@ -72,8 +56,6 @@ - octavia-v2-dsvm-noop-api-stable-2023-1 - octavia-v2-dsvm-noop-api-stable-zed - octavia-v2-dsvm-noop-api-stable-yoga - - octavia-v2-dsvm-noop-api-stable-xena - - octavia-v2-dsvm-noop-api-stable-wallaby - octavia-v2-dsvm-noop-api-keystone-default-roles - octavia-v2-dsvm-scenario-traffic-ops - octavia-v2-dsvm-scenario-non-traffic-ops @@ -83,13 +65,7 @@ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed - octavia-v2-dsvm-scenario-traffic-ops-stable-yoga - octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga - - octavia-v2-dsvm-scenario-traffic-ops-stable-xena - - octavia-v2-dsvm-scenario-non-traffic-ops-stable-xena - - octavia-v2-dsvm-scenario-traffic-ops-stable-wallaby - - octavia-v2-dsvm-scenario-non-traffic-ops-stable-wallaby - octavia-v2-dsvm-tls-barbican - octavia-v2-dsvm-tls-barbican-stable-2023-1 - octavia-v2-dsvm-tls-barbican-stable-zed - octavia-v2-dsvm-tls-barbican-stable-yoga - - octavia-v2-dsvm-tls-barbican-stable-xena - - octavia-v2-dsvm-tls-barbican-stable-wallaby