Merge "disable ovn based testing of test_live_migration_with_trunk"

.zuul.yaml

@@ -124,6 +124,8 @@
     vars:
       tox_envlist: all
       tempest_test_regex: (^tempest\.api\.compute\.admin\.(test_live_migration|test_migration))
+      # revert this when bug #1940425 is fixed in neutron
+      tempest_exclude_regex: (test_live_migration_with_trunk)
       devstack_services:
         neutron-trunk: true
       devstack_local_conf:
@@ -161,6 +163,8 @@
       - ^tox.ini$
     vars:
       tox_envlist: all
+      # bug #1940425  only affect ml2/ovn so we execute
+      # test_live_migration_with_trunk in this job to keep
       tempest_test_regex: (^tempest\..*compute\..*(migration|resize|reboot).*)
       devstack_localrc:
         Q_AGENT: openvswitch
@@ -253,6 +257,8 @@
     vars:
       tox_envlist: all
       tempest_test_regex: (^tempest\.api\.compute\.admin\.(test_live_migration|test_migration))
+      # revert this when bug #1940425 is fixed in neutron
+      tempest_exclude_regex: (test_live_migration_with_trunk)
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -396,7 +402,9 @@
       # tempest_test_exclude_list.
       # FIXME(lyarwood): The tempest.api.compute.admin.test_volume_swap tests
       # are skipped until bug #1929710 is resolved.
-      tempest_exclude_regex: ^tempest\.(scenario\.test_network_(?!qos)|api\.compute\.admin\.test_volume_swap)|tempest.api.compute.servers.test_device_tagging.TaggedAttachmentsTest.test_tagged_attachment
+      # revert excluding test_live_migration_with_trunk when bug #1940425
+      # is fixed in neutron
+      tempest_exclude_regex: ^tempest\.(scenario\.test_network_(?!qos)|api\.compute\.admin\.test_volume_swap)|tempest.api.compute.servers.test_device_tagging.TaggedAttachmentsTest.test_tagged_attachment|test_live_migration_with_trunk
       devstack_local_conf:
         post-config:
           $NOVA_CPU_CONF:
@@ -558,6 +566,8 @@
               block_migrate_cinder_iscsi: true
       tox_envlist: all
       tempest_test_regex: ((tempest\.(api\.compute|scenario)\..*smoke.*)|(^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)))
+      # revert this when bug #1940425 is fixed in neutron
+      tempest_exclude_regex: (test_live_migration_with_trunk)
 
 - job:
     name: nova-multi-cell
@@ -645,6 +655,8 @@
     pre-run:
       - playbooks/ceph/glance-setup.yaml
     vars:
+      # revert this when bug #1940425 is fixed in neutron
+      tempest_exclude_regex: (test_live_migration_with_trunk)
       # NOTE(danms): Increase our swap size since we're dealing with
       # larger images and trigger OOMs.
       configure_swap_size: 8192

devstack/nova-multi-cell-exclude-list.txt

@@ -14,3 +14,6 @@ test_resize_with_qos_min_bw_allocation
 # Also exclude unshelve to specific host test cases as unshelve cannot move VMs across cells
 # See https://bugs.launchpad.net/nova/+bug/1988316
 tempest.api.compute.admin.test_servers_on_multinodes.UnshelveToHostMultiNodesTest
+
+# revert this when bug #1940425 is fixed in neutron
+test_live_migration_with_trunk