From f2db43d57ae980d8cdf08de4f5e6290d7edcc95c Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Tue, 5 Feb 2019 10:40:33 -0500
Subject: [PATCH] Fix legacy-grenade-dsvm-neutron-multinode-live-migration

Since change I81301eeecc7669a169deeb1e2c5d298a595aab94 in
devstack, nova-cpu.conf is a copy of nova.conf minus
database access. Grenade jobs also run nova-compute with
nova-cpu.conf anyway so we can just drop the conditional
which was otherwise messing up the config file that the
ceph script would write rbd configuration which is why
live block migration tests with ceph were failing.

While in here, the zuul job configuration is updated so
that changes to nova/tests/live_migration/ can be
self-testing.

Change-Id: I902e459093af9b82f9033d58cffcb2a628f5ec39
Closes-Bug: #1813216
---
 .zuul.yaml                                   | 19 ++++++++++++++++++-
 nova/tests/live_migration/hooks/run_tests.sh | 10 ----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2f11a75db59d..37cba1368583 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -225,9 +225,26 @@
         - devstack-plugin-ceph-tempest:
             voting: false
             irrelevant-files: *dsvm-irrelevant-files
+        # TODO(mriedem): We need to move this job definition in-tree from
+        # openstack-zuul-jobs.
         - legacy-grenade-dsvm-neutron-multinode-live-migration:
             voting: false
-            irrelevant-files: *dsvm-irrelevant-files
+            irrelevant-files:
+              # We define our own irrelevant-files because we need to run
+              # this if there are changes to nova/tests/live_migration/.
+              - ^api-.*$
+              - ^(test-|)requirements.txt$
+              - ^.*\.rst$
+              - ^.git.*$
+              - ^doc/.*$
+              - ^nova/hacking/.*$
+              - ^nova/locale/.*$
+              - ^(?!nova/tests/live_migration/).*$
+              - ^releasenotes/.*$
+              - ^setup.cfg$
+              - ^tests-py3.txt$
+              - ^tools/.*$
+              - ^tox.ini$
         - neutron-grenade:
             irrelevant-files: *dsvm-irrelevant-files
         - neutron-grenade-multinode:
diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh
index 72e0bab83d76..71afed462943 100755
--- a/nova/tests/live_migration/hooks/run_tests.sh
+++ b/nova/tests/live_migration/hooks/run_tests.sh
@@ -48,16 +48,6 @@ prepare_ceph
 GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
 configure_and_start_glance
 
-# Deal with grenade craziness...
-if [ "$GRENADE_OLD_BRANCH" ]; then
-    # NOTE(mriedem): Grenade runs in singleconductor mode, so it won't use
-    # /etc/nova/nova-cpu.conf so we have to overwrite NOVA_CPU_CONF which is
-    # read in configure_and_start_nova.
-    if ! is_service_enabled n-super-cond; then
-        NOVA_CPU_CONF=$NOVA_CONF
-    fi
-fi
-
 configure_and_start_nova
 run_tempest "Ceph nova&glance test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"