From d882704fd395fdfeef37e1e7c533f258e8fb5644 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Wed, 3 Apr 2019 12:04:04 +0200
Subject: [PATCH] Enable bionic/stein and disco/stein functional tests

Change-Id: I88230ec382ddaf567367bf09cb448c377afb354f
---
 tests/bundles/bionic-stein.yaml | 41 +++++++++++++++++++++++++++++++++
 tests/bundles/disco-stein.yaml  | 38 ++++++++++++++++++++++++++++++
 tests/tests.yaml                |  9 +++++---
 3 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 tests/bundles/bionic-stein.yaml
 create mode 100644 tests/bundles/disco-stein.yaml

diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
new file mode 100644
index 00000000..b67e8e83
--- /dev/null
+++ b/tests/bundles/bionic-stein.yaml
@@ -0,0 +1,41 @@
+series: bionic
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+  '4':
+relations:
+- - keystone:shared-db
+  - mysql:shared-db
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    series: bionic
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      openstack-origin: cloud:bionic-stein
+      token-expiration: 60
+    to:
+    - '1'
+    - '2'
+    - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+    to:
+    - '4'
diff --git a/tests/bundles/disco-stein.yaml b/tests/bundles/disco-stein.yaml
new file mode 100644
index 00000000..50059a0c
--- /dev/null
+++ b/tests/bundles/disco-stein.yaml
@@ -0,0 +1,38 @@
+series: disco
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+  '4':
+relations:
+- - keystone:shared-db
+  - mysql:shared-db
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    series: disco
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      token-expiration: 60
+    to:
+    - '1'
+    - '2'
+    - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    to:
+    - '4'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 5505a158..511d09cb 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -9,14 +9,17 @@ gate_bundles:
 - xenial-queens
 - bionic-queens
 - bionic-rocky
+- bionic-stein
 dev_bundles:
 - cosmic-rocky
-comment:
-- 'the glance configure job validates operation of identity-service relation'
+- disco-stein
+comment: |
+  disable ``disco-stein`` test pending LP: #1823718
+  the glance configure job validates operation of identity-service relation
 configure:
 - zaza.charm_tests.glance.setup.add_lts_image
 - zaza.charm_tests.keystone.setup.add_demo_user
 tests:
 - zaza.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 - zaza.charm_tests.keystone.tests.CharmOperationTest
-- zaza.charm_tests.keystone.tests.SecurityTests
\ No newline at end of file
+- zaza.charm_tests.keystone.tests.SecurityTests