Merge "Adapt bgpvpn scenarios to recent sRBAC changes"
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index d6ba077..b9f293f 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -7,6 +7,8 @@
- dhcp_agent_scheduler
- local_ip
- qos-bw-minimum-ingress
+ - port-resource-request
+ - port-resource-request-groups
tempest_test_regex: "\
(^neutron_tempest_plugin.api)|\
(^neutron_tempest_plugin.scenario)|\
@@ -56,8 +58,6 @@
- network-segment-range
- pagination
- port-device-profile
- - port-resource-request
- - port-resource-request-groups
- port-mac-address-regenerate
- port-security
- port-security-groups-filtering
@@ -106,10 +106,13 @@
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/2023.1
vars:
+ network_api_extensions_common: *api_extensions
network_api_extensions_openvswitch:
- dhcp_agent_scheduler
- local_ip
- logging
+ - port-resource-request
+ - port-resource-request-groups
network_available_features: *available_features
tempest_test_regex: "\
(^neutron_tempest_plugin.api)|\
@@ -157,6 +160,7 @@
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/2023.1
vars:
+ network_api_extensions_common: *api_extensions
network_api_extensions_linuxbridge:
- dhcp_agent_scheduler
- vlan-transparent
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 00eb156..2dc6f07 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -192,7 +192,9 @@
- neutron-tempest-plugin-sfc-yoga
- neutron-tempest-plugin-sfc-zed
- neutron-tempest-plugin-sfc-2023-1
- - neutron-tempest-plugin-bgpvpn-bagpipe
+ # Unstable, https://bugs.launchpad.net/neutron/+bug/2020698
+ - neutron-tempest-plugin-bgpvpn-bagpipe:
+ voting: false
- neutron-tempest-plugin-bgpvpn-bagpipe-yoga
- neutron-tempest-plugin-bgpvpn-bagpipe-zed
- neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
@@ -215,6 +217,7 @@
gate:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-bgpvpn-bagpipe
+ # Unstable, https://bugs.launchpad.net/neutron/+bug/2020698
+ # - neutron-tempest-plugin-bgpvpn-bagpipe
- neutron-tempest-plugin-dynamic-routing
- neutron-tempest-plugin-fwaas
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 649a931..8c70a66 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -6,6 +6,8 @@
vars:
network_api_extensions_openvswitch:
- local_ip
+ - port-resource-request
+ - port-resource-request-groups
- qos-bw-minimum-ingress
tempest_test_regex: "\
(^neutron_tempest_plugin.api)|\
@@ -46,7 +48,6 @@
- l3-ha
- l3-ndp-proxy
- l3_agent_scheduler
- - logging
- metering
- multi-provider
- net-mtu
@@ -56,8 +57,6 @@
- network-segment-range
- pagination
- port-device-profile
- - port-resource-request
- - port-resource-request-groups
- port-mac-address-regenerate
- port-security
- port-security-groups-filtering
@@ -110,9 +109,12 @@
override-checkout: stable/zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
+ network_api_extensions_common: *api_extensions
network_api_extensions_openvswitch:
- local_ip
- logging
+ - port-resource-request
+ - port-resource-request-groups
tempest_test_regex: "\
(^neutron_tempest_plugin.api)|\
(^neutron_tempest_plugin.scenario)|\
@@ -141,6 +143,7 @@
override-checkout: stable/zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
+ network_api_extensions_common: *api_extensions
network_api_extensions_linuxbridge:
- vlan-transparent
tempest_test_regex: "\