From 9a8f03f1d215791f886299eaaf1b64d250becc93 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Tue, 5 Dec 2017 05:29:50 +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: Id8429912709810c485e943be89e42087f4c24120
---
 metadata.yaml                                 |  2 +-
 ...ic-zesty-ocata => dev-basic-bionic-queens} |  4 +--
 tests/dev-basic-xenial-queens                 | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 rename tests/{gate-basic-zesty-ocata => dev-basic-bionic-queens} (85%)
 create mode 100755 tests/dev-basic-xenial-queens

diff --git a/metadata.yaml b/metadata.yaml
index f1e975c..5677a0c 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -10,8 +10,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 provides:
   controller-api:
diff --git a/tests/gate-basic-zesty-ocata b/tests/dev-basic-bionic-queens
similarity index 85%
rename from tests/gate-basic-zesty-ocata
rename to tests/dev-basic-bionic-queens
index 924f009..f3daf0f 100755
--- a/tests/gate-basic-zesty-ocata
+++ b/tests/dev-basic-bionic-queens
@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic odl controller deployment on zesty-ocata."""
+"""Amulet tests on a basic odl controller deployment on bionic-queens."""
 
 from basic_deployment import ODLControllerBasicDeployment
 
 if __name__ == '__main__':
-    deployment = ODLControllerBasicDeployment(series='zesty',
+    deployment = ODLControllerBasicDeployment(series='bionic',
                                               odl_version='beryllium')
     deployment.run_tests()
diff --git a/tests/dev-basic-xenial-queens b/tests/dev-basic-xenial-queens
new file mode 100755
index 0000000..cf3ee6b
--- /dev/null
+++ b/tests/dev-basic-xenial-queens
@@ -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 odl controller deployment on xenial-queens."""
+
+from basic_deployment import ODLControllerBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ODLControllerBasicDeployment(series='xenial',
+                                           openstack='cloud:xenial-queens',
+                                           source='cloud:xenial-updates/queens',
+                                           odl_version='beryllium')
+    deployment.run_tests()