Merge "Use default "ds512M" advance image in older stable branches"
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 58a1d37..f9fdd05 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -120,6 +120,7 @@
- ^tox.ini$
- ^neutron/agent/.*$
- ^neutron/privileged/.*$
+ - ^neutron_lib/tests/unit/.*$
- ^neutron_tempest_plugin/scenario/.*$
@@ -266,6 +267,34 @@
- ^neutron/plugins/ml2/drivers/ovn/.*$
- job:
+ name: neutron-tempest-plugin-scenario-openvswitch-distributed-dhcp
+ parent: neutron-tempest-plugin-scenario-openvswitch
+ timeout: 10000
+ vars:
+ # NOTE: DHCP extra options and dns services aren't supported with
+ # distributed DHCP L2 agent extension
+ tempest_exclude_regex: "\
+ (^neutron_tempest_plugin.scenario.test_dhcp.DHCPTest.test_extra_dhcp_opts)|\
+ (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)"
+ devstack_services:
+ q-dhcp: false
+ q-distributed-dhcp: true
+
+- job:
+ name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-distributed-dhcp
+ parent: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
+ timeout: 10000
+ vars:
+ # NOTE: DHCP extra options and dns services aren't supported with
+ # distributed DHCP L2 agent extension
+ tempest_exclude_regex: "\
+ (^neutron_tempest_plugin.scenario.test_dhcp.DHCPTest.test_extra_dhcp_opts)|\
+ (^neutron_tempest_plugin.scenario.test_internal_dns.InternalDNSTest.test_dns_domain_and_name)"
+ devstack_services:
+ q-dhcp: false
+ q-distributed-dhcp: true
+
+- job:
name: neutron-tempest-plugin-scenario-linuxbridge
parent: neutron-tempest-plugin-scenario
timeout: 10000
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 969f80a..08fb58c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -20,6 +20,8 @@
experimental:
jobs:
- neutron-tempest-plugin-dvr-multinode-scenario
+ - neutron-tempest-plugin-scenario-openvswitch-distributed-dhcp
+ - neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-distributed-dhcp
- project-template: