From 2f68cd3e9f47ca5bb864c26c1b0b123918197ef4 Mon Sep 17 00:00:00 2001 From: Timofey Durakov Date: Tue, 9 Aug 2016 19:35:23 +0300 Subject: [PATCH] Skipping test_volume_backed_live_migration for live_migration job For non-shared storage live-migration job is unstable due to https://bugs.launchpad.net/nova/+bug/1524898. This patch temporary exclude this test from tests to be run. Related-Bug: #1524898 Change-Id: I87559b8e90855837ad7b5f291bd9a8fc646421d3 --- nova/tests/live_migration/hooks/run_tests.sh | 10 +++++----- nova/tests/live_migration/hooks/utils.sh | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh index 949a62c24670..e4cc8cd1731e 100755 --- a/nova/tests/live_migration/hooks/run_tests.sh +++ b/nova/tests/live_migration/hooks/run_tests.sh @@ -26,8 +26,8 @@ STACK_USER=${STACK_USER:-stack} populate_start_script echo '1. test with all local storage (use default for volumes)' - -run_tempest "block migration test" +echo 'NOTE: test_volume_backed_live_migration is skipped due to https://bugs.launchpad.net/nova/+bug/1524898' +run_tempest "block migration test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))" echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04' #echo '2. test with NFS for root + ephemeral disks' @@ -35,7 +35,7 @@ echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04' #nfs_setup #nfs_configure_tempest #nfs_verify_setup -#run_tempest "NFS shared storage test" +#run_tempest "NFS shared storage test" "live_migration" #nfs_teardown echo '3. Ceph testing is skipped due to setup failures with Ubuntu 16.04' @@ -49,9 +49,9 @@ echo '3. Ceph testing is skipped due to setup failures with Ubuntu 16.04' #setup_ceph_cluster #configure_and_start_glance #configure_and_start_nova -#run_tempest "Ceph nova&glance test" +#run_tempest "Ceph nova&glance test" "live_migration" #echo '4. test with Ceph for volumes and root + ephemeral disk' #configure_and_start_cinder -#run_tempest "Ceph nova&glance&cinder test" \ No newline at end of file +#run_tempest "Ceph nova&glance&cinder test" "live_migration" \ No newline at end of file diff --git a/nova/tests/live_migration/hooks/utils.sh b/nova/tests/live_migration/hooks/utils.sh index 591a1feb1cb3..99872b4fe460 100755 --- a/nova/tests/live_migration/hooks/utils.sh +++ b/nova/tests/live_migration/hooks/utils.sh @@ -2,7 +2,8 @@ function run_tempest { local message=$1 - sudo -H -u tempest tox -eall -- --concurrency=$TEMPEST_CONCURRENCY live_migration + local tempest_regex=$2 + sudo -H -u tempest tox -eall -- --concurrency=$TEMPEST_CONCURRENCY $tempest_regex exitcode=$? if [[ $exitcode -ne 0 ]]; then die $LINENO "$message failure"