Skip to content

Commit c0fe95f

Browse files
committed
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
1 parent 7134cbd commit c0fe95f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.zuul.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
volume_backed_live_migration: true
8787
block_migration_for_live_migration: true
8888
block_migrate_cinder_iscsi: true
89+
post-run: playbooks/nova-live-migration/post-run.yaml
8990

9091
# TODO(lyarwood): The following jobs need to be written as part of the
9192
# migration to zuulv3 before nova-live-migration can be removed:
@@ -96,15 +97,6 @@
9697
# Run tempest live migration tests against ceph ephemeral storage and
9798
# cinder volumes.
9899

99-
- job:
100-
name: nova-evacuate
101-
parent: tempest-multinode-full-py3
102-
description: |
103-
Verifiy the evacuation of instances with local qcow2 ephemeral disks
104-
and attached iSCSI/LVM volumes from down compute hosts.
105-
irrelevant-files: *dsvm-irrelevant-files
106-
run: playbooks/nova-evacuate/run.yaml
107-
108100
#- job:
109101
# name: nova-multinode-evacuate-ceph
110102
# description: |
@@ -444,8 +436,6 @@
444436
- nova-live-migration
445437
- nova-multinode-live-migration:
446438
voting: false
447-
- nova-evacuate:
448-
voting: false
449439
- nova-lvm
450440
- nova-multi-cell
451441
- nova-next
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
- hosts: tempest
3+
become: true
4+
roles:
5+
- role: fetch-subunit-output
6+
zuul_work_dir: '{{ devstack_base_dir }}/tempest'
7+
- role: process-stackviz
8+
- hosts: controller
9+
roles:
10+
- run-evacuate-hook

0 commit comments

Comments
 (0)