Skip to content

Commit 91e53e4

Browse files
committed
zuul: Replace grenade and nova-grenade-multinode with grenade-multinode
If2608406776e0d5a06b726e65b55881e70562d18 dropped the single node grenade job from the integrated-gate-compute template as it duplicates the existing grenade-multinode job. However it doesn't remove the remianing single node grenade job still present in the Nova project. This change replaces the dsvm based nova-grenade-multinode job with the zuulv3 native grenade-multinode based job. Various legacy playbooks and hook scripts are also removed as they are no longer used. Note that this does result in a loss of coverage for ceph that should be replaced as soon as a zuulv3 native ceph based multinode job is available. Change-Id: I02b2b851a74f24816d2f782a66d94de81ee527b0
1 parent eba9d59 commit 91e53e4

File tree

9 files changed

+16
-521
lines changed

9 files changed

+16
-521
lines changed

.zuul.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,22 +329,24 @@
329329

330330
- job:
331331
name: nova-grenade-multinode
332-
parent: nova-dsvm-multinode-base
332+
parent: grenade-multinode
333333
description: |
334-
Multi-node grenade job which runs gate/live_migration/hooks tests under
335-
python 3.
336-
In other words, this tests live and cold migration and resize with
337-
mixed-version compute services which is important for things like
338-
rolling upgrade support.
334+
Run a multinode grenade job and run the smoke, cold and live migration
335+
tests with the controller upgraded and the compute on the older release.
339336
The former names for this job were "nova-grenade-live-migration" and
340337
"legacy-grenade-dsvm-neutron-multinode-live-migration".
341-
run: playbooks/legacy/nova-grenade-multinode/run.yaml
342-
post-run: playbooks/legacy/nova-grenade-multinode/post.yaml
343-
required-projects:
344-
- openstack/grenade
345-
- openstack/devstack-gate
346-
- openstack/nova
347338
irrelevant-files: *dsvm-irrelevant-files
339+
vars:
340+
devstack_local_conf:
341+
test-config:
342+
$TEMPEST_CONFIG:
343+
compute-feature-enabled:
344+
live_migration: true
345+
volume_backed_live_migration: true
346+
block_migration_for_live_migration: true
347+
block_migrate_cinder_iscsi: true
348+
tox_envlist: all
349+
tempest_test_regex: ((tempest\.(api\.compute|scenario)\..*smoke.*)|(^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)))
348350

349351
- job:
350352
name: nova-multi-cell
@@ -496,7 +498,6 @@
496498
# so that we only run it on changes to networking and libvirt/vif
497499
# code; we don't need to run this on all changes.
498500
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
499-
- nova-grenade-multinode
500501
- nova-live-migration
501502
- nova-live-migration-ceph
502503
- nova-lvm
@@ -524,7 +525,7 @@
524525
- ^setup.cfg$
525526
- ^tools/.*$
526527
- ^tox.ini$
527-
- grenade:
528+
- nova-grenade-multinode:
528529
irrelevant-files: *policies-irrelevant-files
529530
- tempest-ipv6-only:
530531
irrelevant-files: *dsvm-irrelevant-files
@@ -538,7 +539,6 @@
538539
voting: false
539540
gate:
540541
jobs:
541-
- nova-grenade-multinode
542542
- nova-live-migration
543543
- nova-live-migration-ceph
544544
- nova-tox-functional-py38
@@ -554,7 +554,7 @@
554554
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
555555
- tempest-integrated-compute:
556556
irrelevant-files: *policies-irrelevant-files
557-
- grenade:
557+
- nova-grenade-multinode:
558558
irrelevant-files: *policies-irrelevant-files
559559
- tempest-ipv6-only:
560560
irrelevant-files: *dsvm-irrelevant-files

gate/live_migration/hooks/ceph.sh

Lines changed: 0 additions & 208 deletions
This file was deleted.

gate/live_migration/hooks/nfs.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)