Merge "zuul: Replace grenade and nova-grenade-multinode with grenade-multinode" into stable/wallaby

Author: Zuul

.zuul.yaml

@@ -287,22 +287,24 @@
 
 - job:
     name: nova-grenade-multinode
-    parent: nova-dsvm-multinode-base
+    parent: grenade-multinode
     description: |
-      Multi-node grenade job which runs gate/live_migration/hooks tests under
-      python 3.
-      In other words, this tests live and cold migration and resize with
-      mixed-version compute services which is important for things like
-      rolling upgrade support.
+      Run a multinode grenade job and run the smoke, cold and live migration
+      tests with the controller upgraded and the compute on the older release.
       The former names for this job were "nova-grenade-live-migration" and
       "legacy-grenade-dsvm-neutron-multinode-live-migration".
-    run: playbooks/legacy/nova-grenade-multinode/run.yaml
-    post-run: playbooks/legacy/nova-grenade-multinode/post.yaml
-    required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/nova
     irrelevant-files: *dsvm-irrelevant-files
+    vars:
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            compute-feature-enabled:
+              live_migration: true
+              volume_backed_live_migration: true
+              block_migration_for_live_migration: true
+              block_migrate_cinder_iscsi: true
+      tox_envlist: all
+      tempest_test_regex: ((tempest\.(api\.compute|scenario)\..*smoke.*)|(^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)))
 
 - job:
     name: nova-multi-cell
@@ -454,7 +456,6 @@
               # so that we only run it on changes to networking and libvirt/vif
               # code; we don't need to run this on all changes.
               - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
-        - nova-grenade-multinode
         - nova-live-migration
         - nova-lvm
         - nova-multi-cell
@@ -481,7 +482,7 @@
               - ^setup.cfg$
               - ^tools/.*$
               - ^tox.ini$
-        - grenade:
+        - nova-grenade-multinode:
             irrelevant-files: *policies-irrelevant-files
         - tempest-ipv6-only:
             irrelevant-files: *dsvm-irrelevant-files
@@ -495,7 +496,6 @@
             voting: false
     gate:
       jobs:
-        - nova-grenade-multinode
         - nova-live-migration
         - nova-tox-functional-py38
         - nova-multi-cell
@@ -510,7 +510,7 @@
               - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
         - tempest-integrated-compute:
             irrelevant-files: *policies-irrelevant-files
-        - grenade:
+        - nova-grenade-multinode:
             irrelevant-files: *policies-irrelevant-files
         - tempest-ipv6-only:
             irrelevant-files: *dsvm-irrelevant-files