Merge "Remove old excludes"
diff --git a/manila_tempest_tests/config.py b/manila_tempest_tests/config.py
index 0a98ad5..aebf4a9 100644
--- a/manila_tempest_tests/config.py
+++ b/manila_tempest_tests/config.py
@@ -40,7 +40,7 @@
"This value is only used to validate the versions "
"response from Manila."),
cfg.StrOpt("max_api_microversion",
- default="2.82",
+ default="2.85",
help="The maximum api microversion is configured to be the "
"value of the latest microversion supported by Manila."),
cfg.StrOpt("region",
diff --git a/manila_tempest_tests/tests/api/test_backup.py b/manila_tempest_tests/tests/api/test_backup.py
index f443802..40c48ac 100644
--- a/manila_tempest_tests/tests/api/test_backup.py
+++ b/manila_tempest_tests/tests/api/test_backup.py
@@ -54,11 +54,14 @@
def test_create_share_backup(self):
backup = self.create_backup_wait_for_active(self.share_id)
- # Verify backup create API response
+ # Verify backup create API response, we use the configured max API
+ # version to make this call
expected_keys = ["id", "share_id", "status",
"availability_zone", "created_at", "updated_at",
"size", "progress", "restore_progress",
"name", "description"]
+ if utils.is_microversion_ge(CONF.share.max_api_microversion, '2.85'):
+ expected_keys.append("backup_type")
# Strict key check
actual_backup = self.shares_v2_client.get_share_backup(
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 702dcf8..02d07fe 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -486,12 +486,17 @@
description: Test CephFS NFS (DHSS=False)
parent: manila-tempest-plugin-cephfs-nfs-base
branches: *ubuntu_jammy_test_image_branches
- nodeset: devstack-single-node-centos-9-stream
vars:
# TODO(gouthamr): some tests are disabled due to bugs
# IPv6 Tests: https://bugs.launchpad.net/manila/+bug/1998489
tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
devstack_localrc:
+ CEPHADM_DEPLOY: True
+ CEPHADM_DEV_OSD: True
+ CEPH_LOOPBACK_DISK_SIZE: 40GB
+ CEPHADM_DEPLOY_NFS: False
+ TARGET_DEV_OSD_DIR: /opt/stack
+ ENABLED_SHARE_PROTOCOLS: NFS
MANILA_OPTGROUP_cephfsnfs_cephfs_ganesha_server_ip: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
CEPH_RELEASE: "quincy"
MANILA_SETUP_IPV6: false