Skip to content

Commit 2af08fb

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. Change-Id: I02b2b851a74f24816d2f782a66d94de81ee527b0 (cherry picked from commit 91e53e4) (cherry picked from commit c45bedd)
1 parent e954a56 commit 2af08fb

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
@@ -253,22 +253,24 @@
253253

254254
- job:
255255
name: nova-grenade-multinode
256-
parent: nova-dsvm-multinode-base
256+
parent: grenade-multinode
257257
description: |
258-
Multi-node grenade job which runs gate/live_migration/hooks tests under
259-
python 3.
260-
In other words, this tests live and cold migration and resize with
261-
mixed-version compute services which is important for things like
262-
rolling upgrade support.
258+
Run a multinode grenade job and run the smoke, cold and live migration
259+
tests with the controller upgraded and the compute on the older release.
263260
The former names for this job were "nova-grenade-live-migration" and
264261
"legacy-grenade-dsvm-neutron-multinode-live-migration".
265-
run: playbooks/legacy/nova-grenade-multinode/run.yaml
266-
post-run: playbooks/legacy/nova-grenade-multinode/post.yaml
267-
required-projects:
268-
- openstack/grenade
269-
- openstack/devstack-gate
270-
- openstack/nova
271262
irrelevant-files: *dsvm-irrelevant-files
263+
vars:
264+
devstack_local_conf:
265+
test-config:
266+
$TEMPEST_CONFIG:
267+
compute-feature-enabled:
268+
live_migration: true
269+
volume_backed_live_migration: true
270+
block_migration_for_live_migration: true
271+
block_migrate_cinder_iscsi: true
272+
tox_envlist: all
273+
tempest_test_regex: ((tempest\.(api\.compute|scenario)\..*smoke.*)|(^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)))
272274

273275
- job:
274276
name: nova-multi-cell
@@ -418,7 +420,6 @@
418420
# so that we only run it on changes to networking and libvirt/vif
419421
# code; we don't need to run this on all changes.
420422
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
421-
- nova-grenade-multinode
422423
- nova-live-migration
423424
- nova-lvm
424425
- nova-multi-cell
@@ -443,7 +444,7 @@
443444
- ^setup.cfg$
444445
- ^tools/.*$
445446
- ^tox.ini$
446-
- grenade:
447+
- nova-grenade-multinode:
447448
irrelevant-files: *policies-irrelevant-files
448449
- tempest-ipv6-only:
449450
irrelevant-files: *dsvm-irrelevant-files
@@ -457,7 +458,6 @@
457458
voting: false
458459
gate:
459460
jobs:
460-
- nova-grenade-multinode
461461
- nova-live-migration
462462
- nova-tox-functional-py38
463463
- nova-multi-cell
@@ -472,7 +472,7 @@
472472
- ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
473473
- tempest-integrated-compute:
474474
irrelevant-files: *policies-irrelevant-files
475-
- grenade:
475+
- nova-grenade-multinode:
476476
irrelevant-files: *policies-irrelevant-files
477477
- tempest-ipv6-only:
478478
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)