Browse Source

Move live_migration test hooks under gate/

This patch resolves a TODO in the .zuul.yaml about using common
irrelevant files in our dsvm jobs. To be able to do that we need to move
the test hooks from nova/tests/live_migraton under gate/.

Change-Id: I4e5352fd1a99ff2b4134a734eac6626be772caf1
changes/51/679251/2
Balazs Gibizer 2 years ago
committed by Matt Riedemann
parent
commit
3c1d9dab85
  1. 24
      .zuul.yaml
  2. 0
      gate/live_migration/hooks/ceph.sh
  3. 0
      gate/live_migration/hooks/nfs.sh
  4. 6
      gate/live_migration/hooks/run_tests.sh
  5. 0
      gate/live_migration/hooks/utils.sh
  6. 2
      playbooks/legacy/nova-grenade-live-migration/run.yaml
  7. 2
      playbooks/legacy/nova-live-migration/run.yaml

24
.zuul.yaml

@ -128,25 +128,7 @@
Config drive is forced on all instances.
run: playbooks/legacy/nova-live-migration/run.yaml
post-run: playbooks/legacy/nova-live-migration/post.yaml
irrelevant-files: &live-migration-irrelevant-files
# We define our own irrelevant-files because we need to run
# this if there are changes to nova/tests/live_migration/.
# TODO(mriedem): Move the nova/tests/live_migration/ scripts to gate/
# so this job can use the standard dsvm-irrelevant-files.
- ^api-.*$
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^.git.*$
- ^doc/.*$
- ^nova/hacking/.*$
- ^nova/locale/.*$
- ^nova/tests/(?!live_migration/).*$
- ^nova/test.py$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tests-py3.txt$
- ^tools/.*$
- ^tox.ini$
irrelevant-files: *dsvm-irrelevant-files
- job:
name: nova-lvm
@ -268,7 +250,7 @@
name: nova-grenade-live-migration
parent: nova-dsvm-multinode-base
description: |
Multi-node grenade job which runs nova/tests/live_migration/hooks tests.
Multi-node grenade job which runs gate/live_migration/hooks tests.
In other words, this tests live migration with mixed-version compute
services which is important for things like rolling upgrade support.
The former name for this job was
@ -279,7 +261,7 @@
- openstack/grenade
- openstack/devstack-gate
- openstack/nova
irrelevant-files: *live-migration-irrelevant-files
irrelevant-files: *dsvm-irrelevant-files
- job:
name: nova-multi-cell

0
nova/tests/live_migration/hooks/ceph.sh → gate/live_migration/hooks/ceph.sh

0
nova/tests/live_migration/hooks/nfs.sh → gate/live_migration/hooks/nfs.sh

6
nova/tests/live_migration/hooks/run_tests.sh → gate/live_migration/hooks/run_tests.sh

@ -16,9 +16,9 @@ source $BASE/new/devstack/functions
source $BASE/new/devstack/functions-common
source $BASE/new/devstack/lib/nova
source $WORKSPACE/devstack-gate/functions.sh
source $BASE/new/nova/nova/tests/live_migration/hooks/utils.sh
source $BASE/new/nova/nova/tests/live_migration/hooks/nfs.sh
source $BASE/new/nova/nova/tests/live_migration/hooks/ceph.sh
source $BASE/new/nova/gate/live_migration/hooks/utils.sh
source $BASE/new/nova/gate/live_migration/hooks/nfs.sh
source $BASE/new/nova/gate/live_migration/hooks/ceph.sh
primary_node=$(cat /etc/nodepool/primary_node_private)
SUBNODES=$(cat /etc/nodepool/sub_nodes_private)
SERVICE_HOST=$primary_node

0
nova/tests/live_migration/hooks/utils.sh → gate/live_migration/hooks/utils.sh

2
playbooks/legacy/nova-grenade-live-migration/run.yaml

@ -48,7 +48,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function post_test_hook {
/opt/stack/new/nova/nova/tests/live_migration/hooks/run_tests.sh
/opt/stack/new/nova/gate/live_migration/hooks/run_tests.sh
}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

2
playbooks/legacy/nova-live-migration/run.yaml

@ -48,7 +48,7 @@
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_TOPOLOGY="multinode"
function post_test_hook {
/opt/stack/new/nova/nova/tests/live_migration/hooks/run_tests.sh
/opt/stack/new/nova/gate/live_migration/hooks/run_tests.sh
$BASE/new/nova/gate/test_evacuate.sh
}
export -f post_test_hook

Loading…
Cancel
Save