From 570be19cc0f318fe15d46aee28daa050fb96c9ec Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 3 Apr 2018 22:01:20 -0500 Subject: [PATCH] Update amulet tests Remove soon-to-be deprecated release combos from amulet tests Change-Id: I425410a41a86138b9e6d77e9273a2b10d541e8cc --- ...nial-ocata => dev-basic-snap-xenial-ocata} | 0 tests/gate-basic-trusty-kilo | 25 ------------------- tests/gate-basic-trusty-liberty | 25 ------------------- tests/gate-basic-xenial-newton | 25 ------------------- 4 files changed, 75 deletions(-) rename tests/{gate-basic-snap-xenial-ocata => dev-basic-snap-xenial-ocata} (100%) delete mode 100755 tests/gate-basic-trusty-kilo delete mode 100755 tests/gate-basic-trusty-liberty delete mode 100755 tests/gate-basic-xenial-newton diff --git a/tests/gate-basic-snap-xenial-ocata b/tests/dev-basic-snap-xenial-ocata similarity index 100% rename from tests/gate-basic-snap-xenial-ocata rename to tests/dev-basic-snap-xenial-ocata diff --git a/tests/gate-basic-trusty-kilo b/tests/gate-basic-trusty-kilo deleted file mode 100755 index a732cb0a..00000000 --- a/tests/gate-basic-trusty-kilo +++ /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 keystone deployment on trusty-kilo.""" - -from basic_deployment import KeystoneBasicDeployment - -if __name__ == '__main__': - deployment = KeystoneBasicDeployment(series='trusty', - openstack='cloud:trusty-kilo', - source='cloud:trusty-updates/kilo') - deployment.run_tests() diff --git a/tests/gate-basic-trusty-liberty b/tests/gate-basic-trusty-liberty deleted file mode 100755 index 6a176fc2..00000000 --- a/tests/gate-basic-trusty-liberty +++ /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 keystone deployment on trusty-liberty.""" - -from basic_deployment import KeystoneBasicDeployment - -if __name__ == '__main__': - deployment = KeystoneBasicDeployment(series='trusty', - openstack='cloud:trusty-liberty', - source='cloud:trusty-updates/liberty') - deployment.run_tests() diff --git a/tests/gate-basic-xenial-newton b/tests/gate-basic-xenial-newton deleted file mode 100755 index 150087a0..00000000 --- a/tests/gate-basic-xenial-newton +++ /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 keystone deployment on xenial-newton.""" - -from basic_deployment import KeystoneBasicDeployment - -if __name__ == '__main__': - deployment = KeystoneBasicDeployment(series='xenial', - openstack='cloud:xenial-newton', - source='cloud:xenial-updates/newton') - deployment.run_tests()