From 0b082461f0f2361fbee290e01d04ba9b0e5f4ad9 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 5 Dec 2017 05:30:05 +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: I34e8db0c9cda91704cae6fecbac885ba5d8831b7 --- src/metadata.yaml | 2 +- ...ic-zesty-ocata => dev-basic-bionic-queens} | 4 +-- src/tests/dev-basic-xenial-queens | 26 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) rename src/tests/{gate-basic-zesty-ocata => dev-basic-bionic-queens} (85%) create mode 100755 src/tests/dev-basic-xenial-queens diff --git a/src/metadata.yaml b/src/metadata.yaml index 8b48c45..80c47db 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -21,8 +21,8 @@ tags: - openstack series: - xenial + - bionic - artful - - zesty - trusty provides: neutron-plugin: diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/dev-basic-bionic-queens similarity index 85% rename from src/tests/gate-basic-zesty-ocata rename to src/tests/dev-basic-bionic-queens index b3ea6c9..2ecb8ca 100755 --- a/src/tests/gate-basic-zesty-ocata +++ b/src/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 openvswitch ODL deployment on zesty-ocata.""" +"""Amulet tests on a basic openvswitch ODL deployment on bionic-queens.""" from basic_deployment import OVSODLBasicDeployment if __name__ == '__main__': - deployment = OVSODLBasicDeployment(series='zesty', + deployment = OVSODLBasicDeployment(series='bionic', odl_version='beryllium') 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..320b5c3 --- /dev/null +++ b/src/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 openvswitch ODL deployment on xenial-queens.""" + +from basic_deployment import OVSODLBasicDeployment + +if __name__ == '__main__': + deployment = OVSODLBasicDeployment(series='xenial', + openstack='cloud:xenial-queens', + source='cloud:xenial-updates/queens', + odl_version='beryllium') + deployment.run_tests()