Merge "Skip functional tests on pre-commit config update"
diff --git a/manila_tempest_tests/tests/api/admin/test_export_locations.py b/manila_tempest_tests/tests/api/admin/test_export_locations.py
index db382f2..74df8d1 100644
--- a/manila_tempest_tests/tests/api/admin/test_export_locations.py
+++ b/manila_tempest_tests/tests/api/admin/test_export_locations.py
@@ -58,6 +58,8 @@
summary_keys = ['id', 'path']
if utils.is_microversion_ge(version, '2.14'):
summary_keys += ['preferred']
+ if utils.is_microversion_ge(version, '2.87'):
+ summary_keys += ['metadata']
admin_summary_keys = summary_keys + [
'share_instance_id', 'is_admin_only']
diff --git a/manila_tempest_tests/tests/api/test_replication_export_locations.py b/manila_tempest_tests/tests/api/test_replication_export_locations.py
index 2227290..bff8d2d 100644
--- a/manila_tempest_tests/tests/api/test_replication_export_locations.py
+++ b/manila_tempest_tests/tests/api/test_replication_export_locations.py
@@ -196,6 +196,9 @@
"""Validates exports from the replica export locations APIs"""
el_summary_keys = ['id', 'path', 'replica_state',
'availability_zone', 'preferred']
+ if utils.is_microversion_ge(LATEST_MICROVERSION, '2.87'):
+ el_summary_keys += ['metadata']
+
el_detail_keys = el_summary_keys + ['created_at', 'updated_at']
share, replica, expected_primary_exports, expected_replica_exports = (
self._create_share_and_replica_get_exports()
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index 8a4495e..b8d4425 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -69,7 +69,20 @@
vars: *manila_tempest_image_pinned_vars
- job:
- name: manila-tempest-plugin-lvm-caracal
+ name: manila-tempest-plugin-lvm-2024.2
+ parent: manila-tempest-plugin-lvm-base
+ override-checkout: stable/2024.2
+ vars:
+ # TODO(gouthamr): some tests are disabled due to bugs
+ # IPv6 Tests: https://bugs.launchpad.net/manila/+bug/1998489
+ # drop these overrides once we address that bug.
+ tempest_exclude_regex: '(^manila_tempest_tests.tests.scenario.*IPv6.*)'
+ devstack_localrc:
+ MANILA_SETUP_IPV6: false
+ NEUTRON_CREATE_INITIAL_NETWORKS: true
+
+- job:
+ name: manila-tempest-plugin-lvm-2024.1
parent: manila-tempest-plugin-lvm-base
override-checkout: stable/2024.1
vars:
@@ -82,7 +95,7 @@
NEUTRON_CREATE_INITIAL_NETWORKS: true
- job:
- name: manila-tempest-plugin-lvm-bobcat
+ name: manila-tempest-plugin-lvm-2023.2
parent: manila-tempest-plugin-lvm-base
override-checkout: stable/2023.2
vars:
@@ -95,7 +108,7 @@
NEUTRON_CREATE_INITIAL_NETWORKS: true
- job:
- name: manila-tempest-plugin-lvm-antelope
+ name: manila-tempest-plugin-lvm-2023.1
parent: manila-tempest-plugin-lvm-base
override-checkout: stable/2023.1
vars:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index a6b15af..46d8e5b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,9 +8,10 @@
jobs:
- manila-tempest-plugin-dummy-no-dhss
- manila-tempest-plugin-dummy-dhss
- - manila-tempest-plugin-lvm-caracal
- - manila-tempest-plugin-lvm-bobcat
- - manila-tempest-plugin-lvm-antelope
+ - manila-tempest-plugin-lvm-2024.2
+ - manila-tempest-plugin-lvm-2024.1
+ - manila-tempest-plugin-lvm-2023.2
+ - manila-tempest-plugin-lvm-2023.1
- manila-tempest-plugin-dummy-no-dhss-rbac
- manila-tempest-plugin-container:
voting: false