Merge "Enable bionic/stein and disco/stein functional tests"

src/tests/bundles/bionic-stein.yaml

@@ -0,0 +1,41 @@
+series: bionic
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - vault:shared-db
+- - mysql:shared-db
+  - barbican:shared-db
+- - keystone:identity-service
+  - barbican:identity-service
+- - rabbitmq-server:amqp
+  - barbican:amqp
+- - barbican-vault:secrets
+  - barbican:secrets
+- - vault:secrets
+  - barbican-vault:secrets-storage
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  barbican:
+    series: bionic
+    charm: cs:~openstack-charmers-next/barbican
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  barbican-vault:
+    series: bionic
+    charm: ../../../barbican-vault
+    num_units: 0
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1

src/tests/bundles/cosmic-rocky.yaml

@@ -23,12 +23,12 @@ applications:
     num_units: 1
     options:
   barbican:
-    series: bionic
+    series: cosmic
     charm: cs:~openstack-charmers-next/barbican
     num_units: 1
     options:
   barbican-vault:
-    series: bionic
+    series: cosmic
     charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:

src/tests/bundles/disco-stein.yaml

@@ -0,0 +1,39 @@
+series: disco
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - vault:shared-db
+- - mysql:shared-db
+  - barbican:shared-db
+- - keystone:identity-service
+  - barbican:identity-service
+- - rabbitmq-server:amqp
+  - barbican:amqp
+- - barbican-vault:secrets
+  - barbican:secrets
+- - vault:secrets
+  - barbican-vault:secrets-storage
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+  barbican:
+    series: disco
+    charm: cs:~openstack-charmers-next/barbican
+    num_units: 1
+    options:
+  barbican-vault:
+    series: disco
+    charm: ../../../barbican-vault
+    num_units: 0
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1

src/tests/tests.yaml

@@ -3,7 +3,9 @@ smoke_bundles:
 - bionic-rocky
 gate_bundles:
 - bionic-rocky
+- bionic-stein
 - cosmic-rocky
+- disco-stein
 target_deploy_status:
   barbican-vault:
     workload-status: waiting