From a4dbba98fb720505a8bb8daa1eb4b0b71f8cb706 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Tue, 5 Dec 2017 05:29:17 +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: I6a2a7135e802ccb373e9e11363e66cfa12027c24
---
 metadata.yaml                 |  2 +-
 tests/dev-basic-bionic-queens |  9 +++++++++
 tests/dev-basic-xenial-queens | 11 +++++++++++
 tests/gate-basic-zesty-ocata  |  9 ---------
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100755 tests/dev-basic-bionic-queens
 create mode 100755 tests/dev-basic-xenial-queens
 delete mode 100755 tests/gate-basic-zesty-ocata

diff --git a/metadata.yaml b/metadata.yaml
index 1f0c9288..b968c0df 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -17,8 +17,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 extra-bindings:
   data:
diff --git a/tests/dev-basic-bionic-queens b/tests/dev-basic-bionic-queens
new file mode 100755
index 00000000..b5c17abc
--- /dev/null
+++ b/tests/dev-basic-bionic-queens
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic quantum-gateway deployment on bionic-queens."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='bionic')
+    deployment.run_tests()
diff --git a/tests/dev-basic-xenial-queens b/tests/dev-basic-xenial-queens
new file mode 100755
index 00000000..1039f857
--- /dev/null
+++ b/tests/dev-basic-xenial-queens
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic quantum-gateway deployment on xenial-queens."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='xenial',
+                                        openstack='cloud:xenial-queens',
+                                        source='cloud:xenial-updates/queens')
+    deployment.run_tests()
diff --git a/tests/gate-basic-zesty-ocata b/tests/gate-basic-zesty-ocata
deleted file mode 100755
index 6b8e1ea5..00000000
--- a/tests/gate-basic-zesty-ocata
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic quantum-gateway deployment on zesty-ocata."""
-
-from basic_deployment import NeutronGatewayBasicDeployment
-
-if __name__ == '__main__':
-    deployment = NeutronGatewayBasicDeployment(series='zesty')
-    deployment.run_tests()