Merge "Don't run stable/xena jobs in check/gate queue anymore"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 2347c1b..00eb156 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -180,7 +180,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-xena
- neutron-tempest-plugin-jobs-yoga
- neutron-tempest-plugin-jobs-zed
- neutron-tempest-plugin-jobs-2023-1
@@ -190,17 +189,14 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-xena
- neutron-tempest-plugin-sfc-yoga
- neutron-tempest-plugin-sfc-zed
- neutron-tempest-plugin-sfc-2023-1
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-xena
- neutron-tempest-plugin-bgpvpn-bagpipe-yoga
- neutron-tempest-plugin-bgpvpn-bagpipe-zed
- neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
- neutron-tempest-plugin-dynamic-routing
- - neutron-tempest-plugin-dynamic-routing-xena
- neutron-tempest-plugin-dynamic-routing-yoga
- neutron-tempest-plugin-dynamic-routing-zed
- neutron-tempest-plugin-dynamic-routing-2023-1
@@ -208,12 +204,10 @@
- neutron-tempest-plugin-fwaas-zed
- neutron-tempest-plugin-fwaas-2023-1
- neutron-tempest-plugin-vpnaas
- - neutron-tempest-plugin-vpnaas-xena
- neutron-tempest-plugin-vpnaas-yoga
- neutron-tempest-plugin-vpnaas-zed
- neutron-tempest-plugin-vpnaas-2023-1
- neutron-tempest-plugin-tap-as-a-service
- - neutron-tempest-plugin-tap-as-a-service-xena
- neutron-tempest-plugin-tap-as-a-service-yoga
- neutron-tempest-plugin-tap-as-a-service-zed
- neutron-tempest-plugin-tap-as-a-service-2023-1
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 5d0f617..25d63a9 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -3,6 +3,11 @@
parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: &required-projects-xena
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 2.3.0
+ - openstack/tempest
vars:
tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.api
@@ -96,6 +101,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-xena
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -115,6 +121,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-xena
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -134,6 +141,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-xena
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -153,6 +161,7 @@
name: neutron-tempest-plugin-scenario-ovn-xena
parent: neutron-tempest-plugin-ovn
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -172,6 +181,7 @@
parent: neutron-tempest-plugin-dvr-multinode-scenario
nodeset: openstack-two-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -179,6 +189,7 @@
name: neutron-tempest-plugin-designate-scenario-xena
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -187,6 +198,7 @@
parent: neutron-tempest-plugin-sfc
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -195,6 +207,7 @@
parent: neutron-tempest-plugin-bgpvpn-bagpipe
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions: *api_extensions
@@ -203,6 +216,7 @@
parent: neutron-tempest-plugin-dynamic-routing
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
devstack_localrc:
@@ -233,6 +247,7 @@
parent: neutron-tempest-plugin-vpnaas
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -241,5 +256,6 @@
parent: neutron-tempest-plugin-tap-as-a-service
nodeset: openstack-single-node-focal
override-checkout: stable/xena
+ required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions