Merge "Fix export location sent to manage share operation"
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index ebb86f2..80c455c 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -118,6 +118,12 @@
     name: manila-tempest-plugin-zfsonlinux
     description: Test ZFSOnLinux multibackend (DHSS=False) with postgresql db
     parent: manila-tempest-plugin-base
+    # TODO(gmann): Remove the below nodeset setting to Bionic once
+    # https://bugs.launchpad.net/manila/+bug/1896672 is fixed
+    # Once nodeset is removed form here then devstack base job
+    # will automatically run this job on Ubuntu Focal nodeset from
+    # Victoria gate onwards.
+    nodeset: openstack-single-node-bionic
     vars:
       tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
       devstack_localrc:
@@ -165,6 +171,12 @@
       Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
       environment with IPv6 control plane endpoints.
     parent: manila-tempest-plugin-ipv6-base
+    # TODO(gmann): Remove the below nodeset setting to Bionic once
+    # https://bugs.launchpad.net/manila/+bug/1896672 is fixed
+    # Once nodeset is removed form here then devstack base job
+    # will automatically run this job on Ubuntu Focal nodeset from
+    # Victoria gate onwards.
+    nodeset: openstack-single-node-bionic
     required-projects:
       - openstack/neutron-dynamic-routing
     vars:
@@ -250,6 +262,12 @@
     description: |
       Test the generic driver multibackend (DHSS=True) with NFS and CIFS
     parent: manila-tempest-plugin-base
+    # TODO(gmann): Remove the below nodeset setting to Bionic once
+    # https://bugs.launchpad.net/manila/+bug/1896672 is fixed
+    # Once nodeset is removed form here then devstack base job
+    # will automatically run this job on Ubuntu Focal nodeset from
+    # Victoria gate onwards.
+    nodeset: openstack-single-node-bionic
     vars:
       tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
       # The generic driver uses nova VMs as share servers; running with a
@@ -329,6 +347,12 @@
     name: manila-tempest-plugin-cephfs-nfs
     description: Test CephFS NFS (DHSS=False)
     parent: manila-tempest-plugin-base
+    # TODO(gmann): Remove the below nodeset setting to Bionic once
+    # https://bugs.launchpad.net/manila/+bug/1896672 is fixed
+    # Once nodeset is removed form here then devstack base job
+    # will automatically run this job on Ubuntu Focal nodeset from
+    # Victoria gate onwards.
+    nodeset: openstack-single-node-bionic
     required-projects:
       - openstack/devstack-plugin-ceph
       - openstack/neutron-dynamic-routing
@@ -524,6 +548,12 @@
     description: |
       Test the GlusterFS driver (DHSS=False) with the native NFS protocol
     parent: manila-tempest-plugin-standalone-base
+    # TODO(gmann): Remove the below nodeset setting to Bionic once
+    # https://bugs.launchpad.net/manila/+bug/1896672 is fixed
+    # Once nodeset is removed form here then devstack base job
+    # will automatically run this job on Ubuntu Focal nodeset from
+    # Victoria gate onwards.
+    nodeset: openstack-single-node-bionic
     required-projects:
       - x/devstack-plugin-glusterfs
     vars: