Remove "dhcp_agent_scheduler" API extension from common list
Common list of extensions is used in all jobs definitions and
"dhcp_agent_scheduler" shouldn't be on that list as it isn't available
e.g. in jobs with enabled distributed-dhcp and disabled dhcp agent.
Closes-Bug: #1990629
Change-Id: I689757fedf9cdf70760cc48596d8c936ca7a3c55
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 56f7a6c..8e21880 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -60,7 +60,6 @@
- availability_zone
- binding
- default-subnetpools
- - dhcp_agent_scheduler
- dns-domain-ports
- dns-integration
- dns-integration-domain-keywords
@@ -239,6 +238,7 @@
q-meta: true
q-metering: true
network_api_extensions_openvswitch:
+ - dhcp_agent_scheduler
- local_ip
- qos-bw-minimum-ingress
network_available_features: &available_features
@@ -332,6 +332,7 @@
q-meta: true
q-metering: true
network_api_extensions_openvswitch:
+ - dhcp_agent_scheduler
- local_ip
- logging
network_available_features: *available_features
@@ -423,6 +424,9 @@
parent: neutron-tempest-plugin-openvswitch
timeout: 10000
vars:
+ network_api_extensions_openvswitch:
+ - local_ip
+ - qos-bw-minimum-ingress
# NOTE: DHCP extra options and dns services aren't supported with
# distributed DHCP L2 agent extension
tempest_exclude_regex: "\
@@ -437,6 +441,9 @@
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
timeout: 10000
vars:
+ network_api_extensions_openvswitch:
+ - local_ip
+ - logging
# NOTE: DHCP extra options and dns services aren't supported with
# distributed DHCP L2 agent extension
tempest_exclude_regex: "\
@@ -473,6 +480,7 @@
# SG logging isn't supported by linuxbridge backend
neutron-log: false
network_api_extensions_linuxbridge:
+ - dhcp_agent_scheduler
- vlan-transparent
network_available_features: *available_features
# TODO(eolivare): remove VLAN Transparency tests from blacklist
@@ -726,6 +734,7 @@
tempest_test_timeout: 2400
network_api_extensions_common: *api_extensions
network_api_extensions_dvr:
+ - dhcp_agent_scheduler
- dvr
devstack_localrc:
USE_PYTHON3: true