From 2d70bab004631b25cc612341491403925788ccf7 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Mon, 8 Apr 2019 13:50:25 +0200
Subject: [PATCH] Enable bionic/stein and disco/stein functional tests

Drop explicit install of python-ceph; ceph-common has an
appropriate dependency on the required python{3}-ceph package
so this is not required, and breaks on Stein where Python 2
packages are no longer provided.

Closes-Bug: 1824154
Change-Id: Ia219258f73f038170bc5a070d562e499459fe246
---
 hooks/ceph.py                 |  2 +-
 tests/dev-basic-disco-stein   |  9 +++++++++
 tests/gate-basic-bionic-stein | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100755 tests/dev-basic-disco-stein
 create mode 100755 tests/gate-basic-bionic-stein

diff --git a/hooks/ceph.py b/hooks/ceph.py
index 8000a00..b4878d7 100644
--- a/hooks/ceph.py
+++ b/hooks/ceph.py
@@ -45,7 +45,7 @@ LEADER = 'leader'
 PEON = 'peon'
 QUORUM = [LEADER, PEON]
 
-PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'python-ceph', 'xfsprogs']
+PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs']
 
 
 def ceph_user():
diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein
new file mode 100755
index 0000000..dcbc1be
--- /dev/null
+++ b/tests/dev-basic-disco-stein
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+"""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 0000000..7635695
--- /dev/null
+++ b/tests/gate-basic-bionic-stein
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+"""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()
-- 
GitLab