openstack
/
nova
Code Issues Proposed changes

Skip ceph in grenade live migration job due to restart failures 

Chnage I914430d68f64d29932c9409d055b15e4cb384ec4 made the
live migration scripts assume everything is running under systemd,
which is fine for the non-grenade job since devstack on master (pike)
defaults to run everything under systemd.

We missed, however, that the grenade live migration job is starting
from Ocata where screen is used by default, so when we get to the ceph
part of this job in the grenade setup, trying to restart glance-api
via systemctl fails since it's running under screen, not systemd.

For now we'll just skip the ceph live migration setup in the grenade
run until either the bug is fixed or until Queens is our master branch,
at which point the old side for grenade is Pike and running under
systemd.

Change-Id: Ia0ec32dc7cfe744b21b926949c4ab046f9417bc7
Related-Bug: #1691769
This commit is contained in:
Matt Riedemann 2017-05-18 16:20:56 -04:00
parent 49b85bd2e9
commit 994caa464e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/tests/live_migration/hooks/run_tests.sh
View File

@ -40,12 +40,25 @@ echo '2. NFS testing is skipped due to setup failures with Ubuntu 16.04'
#run_tempest "NFS shared storage test" "live_migration"
#nfs_teardown
echo '3. test with Ceph for root + ephemeral disks'
prepare_ceph
GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
configure_and_start_glance
configure_and_start_nova
run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"
# NOTE(mriedem): devstack in Pike defaults to using systemd but the old side
# for grenade is using screen and that follows through to the new side. Since
# the restart scripts are hard-coded to assume systemd in this job, they will
# fail if the services weren't started under systemd. So we have to skip this
# for grenade jobs in Pike until the bug is fixed to handle restarting services
# running under screen or systemd, or until Queens is our master branch.
# The GRENADE_OLD_BRANCH variable is exported from devstack-gate, not in the
# devstack local.conf.
if [[ "$GRENADE_OLD_BRANCH" == "stable/ocata" ]]; then
# TODO(mriedem): Remove this in Queens if we haven't fixed the bug yet.
echo '3. Grenade testing with Ceph is disabled until bug 1691769 is fixed or Queens.'
else
echo '3. test with Ceph for root + ephemeral disks'
prepare_ceph
GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
configure_and_start_glance
configure_and_start_nova
run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"
fi
set +e
#echo '4. test with Ceph for volumes and root + ephemeral disk'