From bd3d84cfcd2b7696fd5299ac2c906e491d2a73e6 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Mon, 8 Apr 2019 13:52:20 +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 this charm functional
tests job of checking this anyway.  Any such detail should
be deferred to the ``charm-glance`` functional tests.

Change-Id: I10ff155730875fbc47f77bb900e30791e9bfdef0
---
 tests/basic_deployment.py     |  2 +-
 tests/dev-basic-disco-stein   | 24 ++++++++++++++++++++++++
 tests/gate-basic-bionic-stein | 26 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 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 e9b2fb85..24eff6fb 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -308,7 +308,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
                                        'nova-network',
                                        'nova-api'],
             self.keystone_sentry: ['keystone'],
-            self.glance_sentry: ['glance-registry', 'glance-api']
+            self.glance_sentry: ['glance-api']
         }
         cmp_os_release = CompareOpenStackReleases(
             self._get_openstack_release_string()
diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein
new file mode 100755
index 00000000..2c8817d0
--- /dev/null
+++ b/tests/dev-basic-disco-stein
@@ -0,0 +1,24 @@
+#!/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 nova cloud controller deployment on
+   disco-stein."""
+
+from basic_deployment import NovaCCBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaCCBasicDeployment(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..f12f5215
--- /dev/null
+++ b/tests/gate-basic-bionic-stein
@@ -0,0 +1,26 @@
+#!/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 nova cloud controller deployment on
+   bionic-stein."""
+
+from basic_deployment import NovaCCBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaCCBasicDeployment(series='bionic',
+                                       openstack='cloud:bionic-stein',
+                                       source='cloud:bionic-stein')
+    deployment.run_tests()