Update tox.ini files from release-tools gold copy

All OpenStack Charms now contain identical tox.ini files,
not to be modified or made unique within each charm repo.

This is to ensure consistency across charm repos in tox
target naming, approach and purpose, also giving the
charm dev and test experience additional consistency.

Also create empty dirs with .keep files where necessary.
Some classic charms have actions and/or lib dirs, and some
do not. In all classic charms, flake will now check those
dirs to ensure lint coverage of existing or future content.

Rename bespoke amulet smoke test file name to standard.

Change-Id: I0ddef0f8bc000581fc8369e0b837c580b44e6a78
This commit is contained in:
Ryan Beisner 2016-09-08 22:09:20 +00:00
parent 21aa29f8a9
commit 5048222e3d
3 changed files with 9 additions and 8 deletions

View File

@ -1,13 +1,16 @@
# Source charm: ./src/tox.ini
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos.
[tox] [tox]
envlist = pep8 envlist = pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
envdir = .tox/py27
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
AMULET_SETUP_TIMEOUT=2700 AMULET_SETUP_TIMEOUT=2700
passenv = HOME TERM AMULET_HTTP_PROXY AMULET_OS_VIP whitelist_externals = juju
passenv = HOME TERM AMULET_*
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
install_command = install_command =
pip install --allow-unverified python-apt {opts} {packages} pip install --allow-unverified python-apt {opts} {packages}
@ -23,28 +26,24 @@ commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy
[testenv:func27] [testenv:func27]
# Charm Functional Test
# Run all gate tests which are +x (expected to always pass) # Run all gate tests which are +x (expected to always pass)
basepython = python2.7 basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy
[testenv:func27-smoke] [testenv:func27-smoke]
# Charm Functional Test
# Run a specific test as an Amulet smoke test (expected to always pass) # Run a specific test as an Amulet smoke test (expected to always pass)
basepython = python2.7 basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka-keystone-v2 --no-destroy bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy
[testenv:func27-dfs] [testenv:func27-dfs]
# Charm Functional Test
# Run all deploy-from-source tests which are +x (may not always pass!) # Run all deploy-from-source tests which are +x (may not always pass!)
basepython = python2.7 basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy
[testenv:func27-dev] [testenv:func27-dev]
# Charm Functional Test
# Run all development test targets which are +x (may not always pass!) # Run all development test targets which are +x (may not always pass!)
basepython = python2.7 basepython = python2.7
commands = commands =

View File

@ -1,3 +1,6 @@
# Source charm: ./tox.ini
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos.
[tox] [tox]
skipsdist = True skipsdist = True
envlist = pep8,py34,py35 envlist = pep8,py34,py35
@ -7,7 +10,6 @@ skip_missing_interpreters = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
TERM=linux TERM=linux
INTERFACE_PATH={toxinidir}/interfaces
LAYER_PATH={toxinidir}/layers LAYER_PATH={toxinidir}/layers
INTERFACE_PATH={toxinidir}/interfaces INTERFACE_PATH={toxinidir}/interfaces
JUJU_REPOSITORY={toxinidir}/build JUJU_REPOSITORY={toxinidir}/build