@@ -31,23 +31,20 @@ sub tempest() {
my $scenario = 'tempest.scenario';
my $volume_boot_pattern =
"$scenario.test_volume_boot_pattern.TestVolumeBootPattern";
- my $shelve_instance = "$scenario.test_shelve_instance.TestShelveInstance";
-
- # Ignore tests which try to boot a guest with /dev/vda as boot device name.
- push @ignored_tests,
- "^\Q$volume_boot_pattern.test_volume_boot_pattern\E";
- push @ignored_tests,
- "^\Q$volume_boot_pattern.test_create_ebs_image_and_check_boot\E";
- push @ignored_tests,
- "^\Q$shelve_instance.test_shelve_volume_backed_instance\E";
# Those tests access a volume through iSCSI. This does not work when both
# the server and client of iSCSI are on the same Xen host (both in dom0),
# Linux 4.0 is the first Linux to have a fix.
push @ignored_tests,
- "^\Q${volume_boot_pattern}V2.test_volume_boot_pattern\E";
+ "^\Q${volume_boot_pattern}.test_volume_boot_pattern\E";
+ push @ignored_tests,
+ "^\Q${volume_boot_pattern}.test_create_ebs_image_and_check_boot\E";
+
+ # See nova.git:devstack/tempest-dsvm-tempest-xen-rc
+ push @ignored_tests,
+ "^\Qtempest.api.compute.admin.test_volume_swap.TestVolumeSwap.test_volume_swap\E";
push @ignored_tests,
- "^\Q${volume_boot_pattern}V2.test_create_ebs_image_and_check_boot\E";
+ "^\Qtempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_paused_server\E";
# This regex below select the tests to run and exclude the ones marked as
# slow as well as the explicit tests listed above. It is based on the one