zuul: Merge nova-evacuate into nova-multinode-live-migration
Both jobs deploy a multinode env before running their tests so just append the new nova-evacuate tests to the end of the job. Change-Id: If64cdf1002eec1504fa76eb4df39b6b2e4ff3728
This commit is contained in:
parent
7134cbdc7a
commit
c0fe95fcc5
12
.zuul.yaml
12
.zuul.yaml
|
@ -86,6 +86,7 @@
|
||||||
volume_backed_live_migration: true
|
volume_backed_live_migration: true
|
||||||
block_migration_for_live_migration: true
|
block_migration_for_live_migration: true
|
||||||
block_migrate_cinder_iscsi: true
|
block_migrate_cinder_iscsi: true
|
||||||
|
post-run: playbooks/nova-live-migration/post-run.yaml
|
||||||
|
|
||||||
# TODO(lyarwood): The following jobs need to be written as part of the
|
# TODO(lyarwood): The following jobs need to be written as part of the
|
||||||
# migration to zuulv3 before nova-live-migration can be removed:
|
# migration to zuulv3 before nova-live-migration can be removed:
|
||||||
|
@ -96,15 +97,6 @@
|
||||||
# Run tempest live migration tests against ceph ephemeral storage and
|
# Run tempest live migration tests against ceph ephemeral storage and
|
||||||
# cinder volumes.
|
# cinder volumes.
|
||||||
|
|
||||||
- job:
|
|
||||||
name: nova-evacuate
|
|
||||||
parent: tempest-multinode-full-py3
|
|
||||||
description: |
|
|
||||||
Verifiy the evacuation of instances with local qcow2 ephemeral disks
|
|
||||||
and attached iSCSI/LVM volumes from down compute hosts.
|
|
||||||
irrelevant-files: *dsvm-irrelevant-files
|
|
||||||
run: playbooks/nova-evacuate/run.yaml
|
|
||||||
|
|
||||||
#- job:
|
#- job:
|
||||||
# name: nova-multinode-evacuate-ceph
|
# name: nova-multinode-evacuate-ceph
|
||||||
# description: |
|
# description: |
|
||||||
|
@ -444,8 +436,6 @@
|
||||||
- nova-live-migration
|
- nova-live-migration
|
||||||
- nova-multinode-live-migration:
|
- nova-multinode-live-migration:
|
||||||
voting: false
|
voting: false
|
||||||
- nova-evacuate:
|
|
||||||
voting: false
|
|
||||||
- nova-lvm
|
- nova-lvm
|
||||||
- nova-multi-cell
|
- nova-multi-cell
|
||||||
- nova-next
|
- nova-next
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
- hosts: tempest
|
||||||
|
become: true
|
||||||
|
roles:
|
||||||
|
- role: fetch-subunit-output
|
||||||
|
zuul_work_dir: '{{ devstack_base_dir }}/tempest'
|
||||||
|
- role: process-stackviz
|
||||||
|
- hosts: controller
|
||||||
|
roles:
|
||||||
|
- run-evacuate-hook
|
Loading…
Reference in New Issue