Merge "Fix last use of assertDictContainsSubset"
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index eb25f06..208bec3 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -626,9 +626,15 @@
vars:
devstack_localrc:
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
- MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet
+ MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,netapp_active_iq
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
MANILA_ENABLED_BACKENDS: alpha,beta,gamma
+ MANILA_OPTGROUP_DEFAULT_scheduler_default_weighers: NetAppAIQWeigher,CapacityWeigher,GoodnessWeigher,HostAffinityWeigher,PoolWeigher
+ MANILA_OPTGROUP_netapp_active_iq_aiq_transport_type: https
+ MANILA_OPTGROUP_netapp_active_iq_aiq_ssl_verify: False
+ MANILA_OPTGROUP_netapp_active_iq_aiq_username: admin
+ MANILA_OPTGROUP_netapp_active_iq_aiq_password: 123
+ MANILA_OPTGROUP_netapp_active_iq_aiq_hostname: localhost
MANILA_OPTGROUP_alpha_driver_handles_share_servers: false
MANILA_OPTGROUP_alpha_replication_domain: DUMMY_DOMAIN
MANILA_OPTGROUP_alpha_share_backend_name: ALPHA
@@ -684,10 +690,16 @@
vars:
devstack_localrc:
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
- MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,adminnet
+ MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,adminnet,netapp_active_iq
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
MANILA_ENABLED_BACKENDS: alpha,beta
MANILA_OPTGROUP_DEFAULT_quota_share_networks: 50
+ MANILA_OPTGROUP_DEFAULT_scheduler_default_weighers: NetAppAIQWeigher,CapacityWeigher,GoodnessWeigher,HostAffinityWeigher,PoolWeigher
+ MANILA_OPTGROUP_netapp_active_iq_aiq_transport_type: https
+ MANILA_OPTGROUP_netapp_active_iq_aiq_ssl_verify: False
+ MANILA_OPTGROUP_netapp_active_iq_aiq_username: admin
+ MANILA_OPTGROUP_netapp_active_iq_aiq_password: 123
+ MANILA_OPTGROUP_netapp_active_iq_aiq_hostname: localhost
MANILA_OPTGROUP_adminnet_network_api_class: manila.network.standalone_network_plugin.StandaloneNetworkPlugin
MANILA_OPTGROUP_adminnet_network_plugin_ipv4_enabled: true
MANILA_OPTGROUP_adminnet_standalone_network_plugin_allowed_ip_ranges: 11.0.0.10-11.0.0.19,11.0.0.30-11.0.0.39,11.0.0.50-11.0.0.199
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index b8d4425..c5a692b 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -107,24 +107,6 @@
MANILA_SETUP_IPV6: false
NEUTRON_CREATE_INITIAL_NETWORKS: true
-- job:
- name: manila-tempest-plugin-lvm-2023.1
- parent: manila-tempest-plugin-lvm-base
- override-checkout: stable/2023.1
- 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
- # NOTE(carloss): Pinning manila service image to a Focal version,
- # since on Zed we moved to Ubuntu Jammy (22), and it requires more
- # VM resources.
- MANILA_SERVICE_IMAGE_URL: https://tarballs.opendev.org/openstack/manila-image-elements/images/manila-service-image-1.3.0-76-ga216835.qcow2
- MANILA_SERVICE_IMAGE_NAME: manila-service-image-1.3.0-76-ga216835
-
- project-template:
name: manila-tempest-plugin-jobs-using-service-image-stable
description: |
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 68366a3..d2a654e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,7 +11,6 @@
- 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