From e15bb3ecb882bc2d05a0d102a1dad6f078990e56 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Tue, 5 Dec 2017 05:28:51 +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: I7ff0b0a66150ee895f7117db92f6123ec25e5b10
---
 src/metadata.yaml                                      |  2 +-
 ...{gate-basic-zesty-ocata => dev-basic-bionic-queens} |  4 ++--
 src/tests/dev-basic-xenial-queens                      | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 rename src/tests/{gate-basic-zesty-ocata => dev-basic-bionic-queens} (52%)
 create mode 100755 src/tests/dev-basic-xenial-queens

diff --git a/src/metadata.yaml b/src/metadata.yaml
index f9858af..1aa05c2 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -12,8 +12,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/dev-basic-bionic-queens
similarity index 52%
rename from src/tests/gate-basic-zesty-ocata
rename to src/tests/dev-basic-bionic-queens
index 8b6c387..b566dcf 100755
--- a/src/tests/gate-basic-zesty-ocata
+++ b/src/tests/dev-basic-bionic-queens
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-"""Amulet tests on a basic manila deployment on zesty-ocata.
+"""Amulet tests on a basic manila deployment on bionic-queens.
 """
 
 from basic_deployment import ManilaBasicDeployment
 
 if __name__ == '__main__':
-    deployment = ManilaBasicDeployment(series='zesty')
+    deployment = ManilaBasicDeployment(series='bionic')
     deployment.run_tests()
diff --git a/src/tests/dev-basic-xenial-queens b/src/tests/dev-basic-xenial-queens
new file mode 100755
index 0000000..0a7b536
--- /dev/null
+++ b/src/tests/dev-basic-xenial-queens
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic manila deployment on xenial-queens.
+"""
+
+from basic_deployment import ManilaBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaBasicDeployment(series='xenial')
+    deployment.run_tests()