From f9c40c41eeca1815b64facd525181c4de93ff089 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Tue, 5 Dec 2017 05:27:19 +0000
Subject: [PATCH] Add Bionic and remove Zesty series and tests

Bionic, being the next LTS, is important to enable for dev
and test as early as possible ahead of 18.02.

Zesty goes EOL in Jan 2018. The next stable charms release (18.02)
will not provide Zesty series support, as it was an interim
(non-LTS) release.

Change-Id: Ia0ea3d0ce22856c9a705417f258b6d0484bb0882
---
 metadata.yaml                                         |  2 +-
 ...gate-basic-zesty-ocata => dev-basic-bionic-queens} |  4 ++--
 tests/dev-basic-xenial-queens                         | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 rename tests/{gate-basic-zesty-ocata => dev-basic-bionic-queens} (52%)
 create mode 100755 tests/dev-basic-xenial-queens

diff --git a/metadata.yaml b/metadata.yaml
index bd159d0..f6a2342 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,8 +11,8 @@ tags:
   - misc
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 extra-bindings:
   public:
diff --git a/tests/gate-basic-zesty-ocata b/tests/dev-basic-bionic-queens
similarity index 52%
rename from tests/gate-basic-zesty-ocata
rename to tests/dev-basic-bionic-queens
index 4d54057..7179b93 100755
--- a/tests/gate-basic-zesty-ocata
+++ b/tests/dev-basic-bionic-queens
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-"""Amulet tests on a basic ceph deployment on zesty-ocata."""
+"""Amulet tests on a basic ceph deployment on bionic-queens."""
 
 from basic_deployment import CephBasicDeployment
 
 if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='zesty')
+    deployment = CephBasicDeployment(series='bionic')
     deployment.run_tests()
diff --git a/tests/dev-basic-xenial-queens b/tests/dev-basic-xenial-queens
new file mode 100755
index 0000000..829ce93
--- /dev/null
+++ b/tests/dev-basic-xenial-queens
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic ceph deployment on xenial-queens."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='xenial',
+                                     openstack='cloud:xenial-queens',
+                                     source='cloud:xenial-updates/queens')
+    deployment.run_tests()