Enable s3 tests

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/576

Change-Id: I8f8f49932fbcf74aca60922c5f7cdf68fc247672

osci.yaml

@@ -12,6 +12,7 @@
       - bionic-ussuri-41_trilio-wlm
       - bionic-train-41_trilio-wlm
       - focal-ussuri-41_trilio-wlm
+      - bionic-train-41-s3_trilio-wlm
     vars:
       needs_charm_build: true
       charm_build_name: trilio-wlm
@@ -69,4 +70,10 @@
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: focal-ussuri-41
+      tox_extra_args: focal-ussuri-41
+- job:
+    name: bionic-train-41-s3_trilio-wlm
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: bionic-train-41-s3

src/tests/bundles/bionic-train-41-s3.yaml

@@ -1,4 +1,3 @@
-local_overlay_enabled: False
 variables:
   openstack-origin: &openstack-origin 'cloud:bionic-train'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
@@ -142,7 +141,6 @@ applications:
       glance-api-version: 2
   keystone:
     charm: cs:~openstack-charmers-next/keystone
-    series: bionic
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/tests.yaml

@@ -1,7 +1,17 @@
 charm_name: trilio-wlm
 tests:
-  - zaza.openstack.charm_tests.trilio.tests.TrilioWLMTest
+  - zaza.openstack.charm_tests.trilio.tests.TrilioWLMNFSTest
+  - s3:
+    - zaza.openstack.charm_tests.trilio.tests.TrilioWLMS3Test
 configure:
+  - s3:
+    - zaza.openstack.charm_tests.vault.setup.auto_initialize
+    - zaza.openstack.charm_tests.trilio.setup.basic_setup
+    - zaza.openstack.charm_tests.glance.setup.add_cirros_image
+    - zaza.openstack.charm_tests.glance.setup.add_lts_image
+    - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
+    - zaza.openstack.charm_tests.nova.setup.create_flavors
+    - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
   - zaza.openstack.charm_tests.trilio.setup.basic_setup
   - zaza.openstack.charm_tests.vault.setup.auto_initialize
   - zaza.openstack.charm_tests.glance.setup.add_cirros_image
@@ -10,6 +20,7 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.create_flavors
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 gate_bundles:
+  - s3: bionic-train-41-s3
   - bionic-stein-40
   - bionic-stein-41
   - bionic-train-40
@@ -19,7 +30,7 @@ gate_bundles:
   - bionic-queens-40
   - bionic-queens-41
 smoke_bundles:
-  - bionic-train-40
+  - s3: bionic-train-41-s3
 target_deploy_status:
   vault:
     workload-status: blocked
@@ -35,10 +46,14 @@ target_deploy_status:
     workload-status-message: "Ceph broker request incomplete"
   trilio-wlm:
     workload-status: blocked
-    workload-status-message: "nfs-shares configuration not set"
+    workload-status-message-regex: "configuration not set|Unit is ready"
   trilio-data-mover:
     workload-status: blocked
-    workload-status-message: "nfs-shares configuration not set"
+    workload-status-message-regex: "configuration not set|Unit is ready"
   glance:
     workload-status: waiting
     workload-status-message: "Incomplete relations: storage-backend"
+  ceph-radosgw:
+    workload-status: waiting
+    workload-status-message: "Incomplete relations: mon"
+