Sync charm/ceph helpers, tox, and requirements

Change-Id: I4b121d65211622a8a1ff36c553376d1cc5ad89d7

tox.ini

@@ -1,12 +1,14 @@
-# Classic charm: ./tox.ini
+# Classic charm (with amulet): ./tox.ini
 # This file is managed centrally by release-tools and should not be modified
-# within individual charm repos.
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of tox.ini for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
 [tox]
-envlist = pep8,py37
+envlist = pep8,py3
 skipsdist = True
-# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+# NOTE: Avoid build/test env pollution by not enabling sitepackages.
 sitepackages = False
-# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+# NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
 
 [testenv]
@@ -16,9 +18,14 @@ setenv = VIRTUAL_ENV={envdir}
          AMULET_SETUP_TIMEOUT=5400
 install_command =
   pip install {opts} {packages}
-commands = stestr run {posargs}
+commands = stestr run --slowest {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_*
+passenv = HOME TERM AMULET_* CS_* OS_* TEST_*
+
+[testenv:py3]
+basepython = python3
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 
 [testenv:py35]
 basepython = python3.5
@@ -42,11 +49,39 @@ deps = -r{toxinidir}/requirements.txt
 commands = flake8 {posargs} hooks unit_tests tests actions lib files
            charm-proof
 
+[testenv:cover]
+# Technique based heavily upon
+# https://github.com/openstack/nova/blob/master/tox.ini
+basepython = python3
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run
+commands =
+    coverage erase
+    stestr run --slowest {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
+
+[coverage:run]
+branch = True
+concurrency = multiprocessing
+parallel = True
+source =
+    .
+omit =
+    .tox/*
+    */charmhelpers/*
+    unit_tests/*
+
 [testenv:venv]
 basepython = python3
 commands = {posargs}
 
-[testenv:func27-noop]
+[testenv:func-noop]
 # DRY RUN - For Debug
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
@@ -54,7 +89,7 @@ deps = -r{toxinidir}/requirements.txt
 commands =
     bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy
 
-[testenv:func27]
+[testenv:func]
 # Charm Functional Test
 # Run all gate tests which are +x (expected to always pass)
 basepython = python2.7
@@ -63,7 +98,7 @@ deps = -r{toxinidir}/requirements.txt
 commands =
     bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy
 
-[testenv:func27-smoke]
+[testenv:func-smoke]
 # Charm Functional Test
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
@@ -72,16 +107,7 @@ deps = -r{toxinidir}/requirements.txt
 commands =
     bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-stein --no-destroy
 
-[testenv:func27-dfs]
-# Charm Functional Test
-# Run all deploy-from-source tests which are +x (may not always pass!)
-basepython = python2.7
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-commands =
-    bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy
-
-[testenv:func27-dev]
+[testenv:func-dev]
 # Charm Functional Test
 # Run all development test targets which are +x (may not always pass!)
 basepython = python2.7