From 5c84d88d733c5594107c634527a1a4fc12056946 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 18 Feb 2020 15:36:55 +0000 Subject: [PATCH] Remove disco support from the charm And clean up the cosmic test and remove it as well. Change-Id: Ibf02186ea5977839e16fe03a3267fe92b84d83b9 --- .gitreview | 2 +- metadata.yaml | 2 -- tests/dev-basic-cosmic-rocky | 25 ------------------------- tests/dev-basic-disco-stein | 25 ------------------------- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100755 tests/dev-basic-cosmic-rocky delete mode 100755 tests/dev-basic-disco-stein diff --git a/.gitreview b/.gitreview index 34276c7..af495ce 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.opendev.org port=29418 -project=openstack/charm-lxd.git +project=openstack/charm-nova-lxd.git diff --git a/metadata.yaml b/metadata.yaml index 5a0bd6b..62e1beb 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -9,8 +9,6 @@ tags: series: - xenial - bionic - - cosmic - - disco subordinate: true peers: lxd-migration: diff --git a/tests/dev-basic-cosmic-rocky b/tests/dev-basic-cosmic-rocky deleted file mode 100755 index 88b570b..0000000 --- a/tests/dev-basic-cosmic-rocky +++ /dev/null @@ -1,25 +0,0 @@ -#!/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 lxd deployment on cosmic-rocky.""" - -from basic_deployment import LXDBasicDeployment - -if __name__ == '__main__': - deployment = LXDBasicDeployment( - series='cosmic', openstack=None, source=None, - stable=False) - deployment.run_tests() diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein deleted file mode 100755 index 9b4261e..0000000 --- a/tests/dev-basic-disco-stein +++ /dev/null @@ -1,25 +0,0 @@ -#!/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 lxd deployment on disco-stein.""" - -from basic_deployment import LXDBasicDeployment - -if __name__ == '__main__': - deployment = LXDBasicDeployment( - series='disco', openstack=None, source=None, - stable=False) - deployment.run_tests()