diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 85f65c6d..edc9334b 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -91,3 +91,94 @@ share.enable_protocols 'nfs' share.nfs_versions '3,4.1,4.2' share.run_share_group_tests False + +- job: + name: manila-s2i-test-dummy-dhss + parent: s2i-test-base + description: | + Validate s2i manila images against an OpenStack deployment using the + dummy driver with DHSS=True. + irrelevant-files: *ir_files + vars: + s2i_manila_share_backends: ['share1'] + # Second dhss backend is staged below; extend to ['share1', 'share2']. + cifmw_test_operator_tempest_concurrency: 3 + cifmw_test_operator_tempest_include_list: | + ^manila_tempest_tests.tests.api..* + # ^manila_tempest_tests.tests.scenario..* + # Omitted scenario tests as POC. + # With a second backend, also add these tempest overrides: + # share.backend_names ALPHA,BETA + # share.multi_backend True + cifmw_test_operator_tempest_tempestconf_config: + overrides: | + share.multitenancy_enabled True + share.catalog_type 'sharev2' + share.default_share_type_name 'default' + share.run_share_group_tests False + share.suppress_errors_in_cleanup True + share.run_ipv6_tests False + share.enable_protocols nfs + share.capability_storage_protocol NFS_CIFS + share.backend_names ALPHA + # yamllint disable rule:line-length + cifmw_edpm_prepare_kustomizations: + - apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + namespace: openstack + patches: + - target: + kind: OpenStackControlPlane + patch: |- + - op: replace + path: /spec/manila/enabled + value: true + - op: add + path: /spec/manila/template/customServiceConfig + value: | + [DEFAULT] + enabled_share_backends = alpha + enabled_share_protocols = NFS + debug = True + [alpha] + driver_handles_share_servers = True + share_backend_name = ALPHA + share_driver = manila.tests.share.drivers.dummy.DummyDriver + network_config_group = membernet + admin_network_config_group = membernet + [membernet] + network_api_class = manila.network.standalone_network_plugin.StandaloneNetworkPlugin + network_plugin_ipv4_enabled = True + standalone_network_plugin_allowed_ip_ranges = 10.0.0.10-10.0.0.209 + standalone_network_plugin_gateway = 10.0.0.1 + standalone_network_plugin_mask = 24 + standalone_network_plugin_network_type = vlan + standalone_network_plugin_segmentation_id = 1010 + # Add the second dhss backend (BETA). Also set + # s2i_manila_share_backends: ['share1', 'share2'] above and the + # multi-backend tempest overrides. Per-backend config goes under + # manilaShares.share2 (not top-level) so each share pod is distinct: + # - op: add + # path: /spec/manila/template/manilaShares/share2 + # value: + # replicas: 1 + # networkAttachments: + # - storage + # customServiceConfig: | + # [DEFAULT] + # enabled_share_backends = beta + # enabled_share_protocols = NFS,CIFS + # [beta] + # driver_handles_share_servers = True + # share_backend_name = BETA + # share_driver = manila.tests.share.drivers.dummy.DummyDriver + # network_config_group = membernet + # admin_network_config_group = membernet + # [membernet] + # network_api_class = manila.network.standalone_network_plugin.StandaloneNetworkPlugin + # network_plugin_ipv4_enabled = True + # standalone_network_plugin_allowed_ip_ranges = 10.0.1.10-10.0.1.209 + # standalone_network_plugin_gateway = 10.0.1.1 + # standalone_network_plugin_mask = 24 + # standalone_network_plugin_network_type = vlan + # standalone_network_plugin_segmentation_id = 1020 diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index a5b49628..6d1887a7 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -13,6 +13,10 @@ jobs: - manila-s2i-test-nfsganesha: dependencies: *manila_s2i_operator_test_dependencies + - manila-s2i-test-dummy-dhss: + dependencies: + - openstack-k8s-operators-content-provider + - manila-s2i-content-provider # project template to be used in the s2i repository - project-template: