From b55b9707f04aaeb38ddca07c3b43ffdf2f927861 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 28 Mar 2018 14:03:02 -0500 Subject: [PATCH] Update amulet test definitions Enable Queens, and set Queens as the smoke gate Remove Mitaka test target (not published as tested or recommended). Change-Id: I634d8960803133d2dfca1961f7b482a268b995aa --- ...bionic-queens => gate-basic-bionic-queens} | 0 src/tests/gate-basic-xenial-mitaka | 23 ------------------- src/tox.ini | 2 +- 3 files changed, 1 insertion(+), 24 deletions(-) rename src/tests/{dev-basic-bionic-queens => gate-basic-bionic-queens} (100%) delete mode 100644 src/tests/gate-basic-xenial-mitaka diff --git a/src/tests/dev-basic-bionic-queens b/src/tests/gate-basic-bionic-queens similarity index 100% rename from src/tests/dev-basic-bionic-queens rename to src/tests/gate-basic-bionic-queens diff --git a/src/tests/gate-basic-xenial-mitaka b/src/tests/gate-basic-xenial-mitaka deleted file mode 100644 index 3783f98..0000000 --- a/src/tests/gate-basic-xenial-mitaka +++ /dev/null @@ -1,23 +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 Gnocchi Charm deployment on xenial-mitaka.""" - -from basic_deployment import GnocchiCharmDeployment - -if __name__ == '__main__': - deployment = GnocchiCharmDeployment(series='xenial') - deployment.run_tests() diff --git a/src/tox.ini b/src/tox.ini index 566f627..7e6dbe1 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -35,7 +35,7 @@ commands = # Run a specific test as an Amulet smoke test (expected to always pass) basepython = python2.7 commands = - bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy + bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-queens --no-destroy [testenv:func27-dfs] # Run all deploy-from-source tests which are +x (may not always pass!)