Skip to content

Commit f8969bc

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Add cold migrate and resize to nova-grenade-multinode"
2 parents c477f36 + 2cf9a5f commit f8969bc

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.zuul.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,9 @@
251251
parent: nova-dsvm-multinode-base
252252
description: |
253253
Multi-node grenade job which runs gate/live_migration/hooks tests.
254-
In other words, this tests live migration with mixed-version compute
255-
services which is important for things like rolling upgrade support.
254+
In other words, this tests live and cold migration and resize with
255+
mixed-version compute services which is important for things like
256+
rolling upgrade support.
256257
The former names for this job were "nova-grenade-live-migration" and
257258
"legacy-grenade-dsvm-neutron-multinode-live-migration".
258259
run: playbooks/legacy/nova-grenade-multinode/run.yaml

gate/live_migration/hooks/run_tests.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,16 @@ echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04'
4343
#run_tempest "NFS shared storage test" "live_migration"
4444
#nfs_teardown
4545

46-
echo '3. test with Ceph for root + ephemeral disks'
46+
# The nova-grenade-multinode job also runs resize and cold migration tests
47+
# so we check for a grenade-only variable.
48+
if [[ -n "$GRENADE_NEW_BRANCH" ]]; then
49+
echo '3. test cold migration and resize'
50+
run_tempest "cold migration and resize test" "test_resize_server|test_cold_migration|test_revert_cold_migration"
51+
else
52+
echo '3. cold migration and resize is skipped for non-grenade jobs'
53+
fi
54+
55+
echo '4. test with Ceph for root + ephemeral disks'
4756
# Discover and set variables for the OS version so the devstack-plugin-ceph
4857
# scripts can find the correct repository to install the ceph packages.
4958
GetOSVersion
@@ -55,7 +64,7 @@ configure_and_start_nova
5564
run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"
5665

5766
set +e
58-
#echo '4. test with Ceph for volumes and root + ephemeral disk'
67+
#echo '5. test with Ceph for volumes and root + ephemeral disk'
5968

6069
#configure_and_start_cinder
6170
#run_tempest "Ceph nova&glance&cinder test" "live_migration"

0 commit comments

Comments
 (0)