Skip to content

Commit c45bedd

Browse files
lyarwoodmelwitt
authored andcommitted
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. Conflicts: playbooks/legacy/nova-grenade-multinode/run.yaml NOTE(melwitt): The conflict is because change I51f0273e90ee39d644cf85a0bdb9d4f95de6d3c7 ([OVN] Explicitly set grenade job to ML2/OVS) is not in Wallaby. Change-Id: I02b2b851a74f24816d2f782a66d94de81ee527b0 (cherry picked from commit 91e53e4)
1 parent 8b50f48 commit c45bedd

File tree

9 files changed

+16
-512
lines changed

9 files changed

+16
-512
lines changed

.zuul.yaml

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

288288
- job:
289289
name: nova-grenade-multinode
290-
parent: nova-dsvm-multinode-base
290+
parent: grenade-multinode
291291
description: |
292-
Multi-node grenade job which runs gate/live_migration/hooks tests under
293-
python 3.
294-
In other words, this tests live and cold migration and resize with
295-
mixed-version compute services which is important for things like
296-
rolling upgrade support.
292+
Run a multinode grenade job and run the smoke, cold and live migration
293+
tests with the controller upgraded and the compute on the older release.
297294
The former names for this job were "nova-grenade-live-migration" and
298295
"legacy-grenade-dsvm-neutron-multinode-live-migration".
299-
run: playbooks/legacy/nova-grenade-multinode/run.yaml
300-
post-run: playbooks/legacy/nova-grenade-multinode/post.yaml
301-
required-projects:
302-
- openstack/grenade
303-
- openstack/devstack-gate
304-
- openstack/nova
305296
irrelevant-files: *dsvm-irrelevant-files
297+
vars:
298+
devstack_local_conf:
299+
test-config:
300+
$TEMPEST_CONFIG:
301+
compute-feature-enabled:
302+
live_migration: true
303+
volume_backed_live_migration: true
304+
block_migration_for_live_migration: true
305+
block_migrate_cinder_iscsi: true
306+
tox_envlist: all
307+
tempest_test_regex: ((tempest\.(api\.compute|scenario)\..*smoke.*)|(^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)))
306308

307309
- job:
308310
name: nova-multi-cell
@@ -454,7 +456,6 @@
454456
# so that we only run it on changes to networking and libvirt/vif
455457
# code; we don't need to run this on all changes.
456458
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
457-
- nova-grenade-multinode
458459
- nova-live-migration
459460
- nova-lvm
460461
- nova-multi-cell
@@ -481,7 +482,7 @@
481482
- ^setup.cfg$
482483
- ^tools/.*$
483484
- ^tox.ini$
484-
- grenade:
485+
- nova-grenade-multinode:
485486
irrelevant-files: *policies-irrelevant-files
486487
- tempest-ipv6-only:
487488
irrelevant-files: *dsvm-irrelevant-files
@@ -495,7 +496,6 @@
495496
voting: false
496497
gate:
497498
jobs:
498-
- nova-grenade-multinode
499499
- nova-live-migration
500500
- nova-tox-functional-py38
501501
- nova-multi-cell
@@ -510,7 +510,7 @@
510510
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
511511
- tempest-integrated-compute:
512512
irrelevant-files: *policies-irrelevant-files
513-
- grenade:
513+
- nova-grenade-multinode:
514514
irrelevant-files: *policies-irrelevant-files
515515
- tempest-ipv6-only:
516516
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)