Add manila and manila tempest support to distro bundles

openstack-charmers · May 19, 2022 · bcc923a · bcc923a
1 parent c9eeea2
commit bcc923a
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 0 deletions.
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -8,6 +8,7 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
 git+https://opendev.org/openstack/cinder-tempest-plugin.git#egg=cinder-tempest-plugin;python_version>='3.6'
 git+https://opendev.org/openstack/designate-tempest-plugin.git#egg=designate-tempest-plugin;python_version>='3.6'
+git+https://opendev.org/openstack/manila-tempest-plugin.git#egg=manila-tempest-plugin;python_version>='3.6'
 cinder-tempest-plugin;python_version<'3.6'
 designate-tempest-plugin;python_version<'3.6'
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85

diff --git a/tests/distro-regression/tests/bundles/focal-yoga.yaml b/tests/distro-regression/tests/bundles/focal-yoga.yaml
@@ -34,6 +34,12 @@ applications:
   ceilometer-agent:
     charm: ch:ceilometer-agent
     channel: yoga/edge
+  ceph-fs:
+    num_units: 1
+    charm: ch:ceph-fs
+    options:
+      source: *openstack-origin
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -124,6 +130,26 @@ applications:
   keystone-mysql-router:
     charm: ch:mysql-router
     channel: 8.0.19/edge
+  manila:
+    charm: ch:manila
+    num_units: 1
+    options:
+      default-share-backend: cephfsnfs1
+      share-protocols: NFS
+      openstack-origin: *openstack-origin
+    channel: yoga/edge
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  manila-ganesha:
+    charm: ch:manila-ganesha
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: yoga/edge
+  manila-ganesha-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
   memcached:
     charm: ch:memcached
     num_units: 1
@@ -341,6 +367,8 @@ relations:
   - nova-cloud-controller:neutron-api
 - - neutron-api:identity-service
   - keystone:identity-service
+- - ceph-mon
+  - ceph-fs
 - - ceph-osd:mon
   - ceph-mon:osd
 - - aodh:amqp
@@ -417,6 +445,8 @@ relations:
   - glance:certificates
 - - vault:certificates
   - keystone:certificates
+- - vault:certificates
+  - manila:certificates
 - - vault:certificates
   - nova-cloud-controller:certificates
 - - vault:certificates
@@ -495,3 +525,23 @@ relations:
   - octavia-diskimage-retrofit:certificates
 - - vault:certificates
   - glance-simplestreams-sync:certificates
+- - ceph-mon
+  - manila-ganesha
+- - manila:shared-db
+  - manila-mysql-router:shared-db
+- - manila-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila-ganesha
+  - rabbitmq-server
+- - manila-ganesha
+  - keystone
+- - manila
+  - manila-ganesha
+- - manila-ganesha:shared-db
+  - manila-ganesha-mysql-router:shared-db
+- - manila-ganesha-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila
+  - rabbitmq-server
+- - manila
+  - keystone
diff --git a/tests/distro-regression/tests/bundles/jammy-yoga.yaml b/tests/distro-regression/tests/bundles/jammy-yoga.yaml
@@ -34,6 +34,12 @@ applications:
   ceilometer-agent:
     charm: ch:ceilometer-agent
     channel: yoga/edge
+  ceph-fs:
+    num_units: 1
+    charm: ch:ceph-fs
+    options:
+      source: *openstack-origin
+    channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -124,6 +130,26 @@ applications:
   keystone-mysql-router:
     charm: ch:mysql-router
     channel: 8.0.19/edge
+  manila:
+    charm: ch:manila
+    num_units: 1
+    options:
+      default-share-backend: cephfsnfs1
+      share-protocols: NFS
+      openstack-origin: *openstack-origin
+    channel: yoga/edge
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
+  manila-ganesha:
+    charm: ch:manila-ganesha
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: yoga/edge
+  manila-ganesha-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0.19/edge
   memcached:
     charm: ch:memcached
     num_units: 1
@@ -341,6 +367,8 @@ relations:
   - nova-cloud-controller:neutron-api
 - - neutron-api:identity-service
   - keystone:identity-service
+- - ceph-mon
+  - ceph-fs
 - - ceph-osd:mon
   - ceph-mon:osd
 - - aodh:amqp
@@ -417,6 +445,8 @@ relations:
   - glance:certificates
 - - vault:certificates
   - keystone:certificates
+- - vault:certificates
+  - manila:certificates
 - - vault:certificates
   - nova-cloud-controller:certificates
 - - vault:certificates
@@ -495,3 +525,23 @@ relations:
   - octavia-diskimage-retrofit:certificates
 - - vault:certificates
   - glance-simplestreams-sync:certificates
+- - ceph-mon
+  - manila-ganesha
+- - manila:shared-db
+  - manila-mysql-router:shared-db
+- - manila-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila-ganesha
+  - rabbitmq-server
+- - manila-ganesha
+  - keystone
+- - manila
+  - manila-ganesha
+- - manila-ganesha:shared-db
+  - manila-ganesha-mysql-router:shared-db
+- - manila-ganesha-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila
+  - rabbitmq-server
+- - manila
+  - keystone
diff --git a/tests/distro-regression/tests/tests.yaml b/tests/distro-regression/tests/tests.yaml
@@ -88,6 +88,12 @@ tests_options:
       smoke: True
     keystone_v3_smoke_focal:
       smoke: True
+      include-list:
+        - "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_snapshot_instances.ShareSnapshotInstancesTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_types.ShareTypesAdminTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_shares_actions.SharesActionsAdminTest.*"
   force_deploy:
     - trusty-icehouse
     - trusty-mitaka