Fix the smoke test bundle

* remove resources from the smoke test bundle
  * attach_saml_resources step in Zaza does it https://git.io/JfKTp
* use the same set of applications in the smoke bundle so that configure
  steps and func tests pass.

Change-Id: Ic5c7bbb479197b7bc7161c2cd6090984901fa2b6
Closes-Bug: #1881267

src/tests/bundles/bionic-queens-smoke-ha.yaml

@@ -1,59 +0,0 @@
-series: bionic
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - keystone
-  - keystone-saml-mellon
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - openstack-dashboard:certificates
-- - openstack-dashboard
-  - keystone-saml-mellon
-- - keystone:websso-trusted-dashboard
-  - openstack-dashboard:websso-trusted-dashboard
-- - openstack-dashboard:identity-service
-  -  keystone:identity-service
-applications:
-  mysql:
-    constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      token-provider: 'fernet'
-      token-expiration: 60
-  keystone-saml-mellon:
-    series: bionic
-    charm: ../../../keystone-saml-mellon
-    num_units: 0
-    options:
-      idp-name: 'samltest'
-      protocol-name: 'mapped'
-      user-facing-name: "samltest.id"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-    resources:
-      idp-metadata: "./idp-metadata.xml"
-      sp-signing-keyinfo: "./sp-signing-keyinfo.xml"
-      sp-private-key: "./sp-private-key.pem"
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-  openstack-dashboard:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/openstack-dashboard

src/tests/tests.yaml

@@ -1,7 +1,7 @@
 charm_name: keystone-saml-mellon
 
 smoke_bundles:
-- bionic-queens-smoke-ha
+- bionic-queens-ha
 
 gate_bundles:
 - bionic-queens-ha