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

Drop service check for ``glance-registry``.  The service is
removed as of Stein, and it really is not the ``charm-ceph-mon``
functional tests job of checking this anyway.  Any such detail
should be deferred to the ``charm-glance`` functional tests.

Change-Id: I85dd396b55e3d1582da18c6d8248ba1cced3e89f
---
 tests/basic_deployment.py     |  3 +--
 tests/dev-basic-disco-stein   | 23 +++++++++++++++++++++++
 tests/gate-basic-bionic-stein | 25 +++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100755 tests/dev-basic-disco-stein
 create mode 100755 tests/gate-basic-bionic-stein

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index da0a7d07..3713bdb7 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -287,8 +287,7 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
             self.rabbitmq_sentry: ['rabbitmq-server'],
             self.nova_sentry: ['nova-compute'],
             self.keystone_sentry: ['keystone'],
-            self.glance_sentry: ['glance-registry',
-                                 'glance-api'],
+            self.glance_sentry: ['glance-api'],
             self.cinder_sentry: ['cinder-scheduler',
                                  'cinder-volume'],
         }
diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein
new file mode 100755
index 00000000..27d2c980
--- /dev/null
+++ b/tests/dev-basic-disco-stein
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic ceph deployment on disco-stein."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='disco')
+    deployment.run_tests()
diff --git a/tests/gate-basic-bionic-stein b/tests/gate-basic-bionic-stein
new file mode 100755
index 00000000..ab8f6f20
--- /dev/null
+++ b/tests/gate-basic-bionic-stein
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic ceph deployment on bionic-stein."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='bionic',
+                                     openstack='cloud:bionic-stein',
+                                     source='cloud:bionic-stein')
+    deployment.run_tests()