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

Change-Id: Ibf106a4c327e0f078b41061d83b0ae09694cf0a5
---
 src/tests/bundles/bionic-stein.yaml | 102 ++++++++++++++++++++++++++++
 src/tests/tests.yaml                |   4 +-
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/bundles/bionic-stein.yaml

diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
new file mode 100644
index 0000000..b09dcf8
--- /dev/null
+++ b/src/tests/bundles/bionic-stein.yaml
@@ -0,0 +1,102 @@
+series: bionic
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: cloud:bionic-stein
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: cloud:bionic-stein
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    num_units: 0
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: cloud:bionic-stein
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: cloud:bionic-stein
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+  ceph-rbd-mirror:
+    series: bionic
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: cloud:bionic-stein
+  ceph-mon-b:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      source: cloud:bionic-stein
+  ceph-osd-b:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    options:
+      source: cloud:bionic-stein
+      bluestore: False
+      use-direct-io: False
+      osd-devices: /opt
+  ceph-rbd-mirror-b:
+    series: bionic
+    charm: ../../../ceph-rbd-mirror
+    num_units: 1
+    options:
+      source: cloud:bionic-stein
+relations:
+- - mysql
+  - keystone
+- - mysql
+  - cinder
+- - mysql
+  - glance
+- - rabbitmq-server
+  - cinder
+- - keystone
+  - cinder
+- - keystone
+  - glance
+- - cinder
+  - cinder-ceph
+- - cinder-ceph
+  - ceph-mon
+- - glance
+  - ceph-mon
+- - ceph-mon:osd
+  - ceph-osd:mon
+- - ceph-mon
+  - ceph-rbd-mirror:ceph-local
+- - ceph-mon
+  - ceph-rbd-mirror-b:ceph-remote
+- - ceph-mon-b:osd
+  - ceph-osd-b:mon
+- - ceph-mon-b
+  - ceph-rbd-mirror-b:ceph-local
+- - ceph-mon-b
+  - ceph-rbd-mirror:ceph-remote
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 813be83..1cc20b3 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -6,13 +6,13 @@ gate_bundles:
 - xenial-queens
 - bionic-queens
 - bionic-rocky
+- bionic-stein
 - cosmic-rocky
+- disco-stein
 comment: |
-  Hold ``disco-stein`` bundle until all dependend charms have disco support.
   The e2e bundles are useful for development but adds no additional value to
   the functional tests.
 dev_bundles:
-- disco-stein
 - bionic-queens-e2e
 - bionic-queens-e2e-lxd
 configure: