Merge "Fix share server migration tests"
diff --git a/manila_tempest_tests/tests/api/admin/test_share_manage.py b/manila_tempest_tests/tests/api/admin/test_share_manage.py
index 5cda130..09bbdb7 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_manage.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_manage.py
@@ -85,10 +85,14 @@
share_ids = [si['share_id'] for si in share_instance_list]
self.assertNotIn(share['id'], share_ids)
+ export_path = share['export_locations'][0]
+ if utils.is_microversion_ge(version, "2.8"):
+ export_path = share['export_locations'][0]['path']
+
# Manage share
manage_params = {
'service_host': share['host'],
- 'export_path': share['export_locations'][0],
+ 'export_path': export_path,
'protocol': share['share_proto'],
'share_type_id': self.st['share_type']['id'],
'name': name,
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 32f672f..4dc7e55 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: