Release sync for 20.08

- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Change-Id: I487b03725a7c0f14ac51624abde83ddd5c8080a1

rebuild

@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-88648d6c-b6df-11ea-aa46-d750d869fb58
+da05ac26-d02c-11ea-b4de-477e559fb1c1

src/test-requirements.txt

@@ -1,11 +1,8 @@
-# This file is managed centrally.  If you find the need to modify this as a
-# one-off, please don't.  Intead, consult #openstack-charms and ask about
-# requirements management in charms via bot-control.  Thank you.
-charm-tools>=2.4.4
-coverage>=3.6
-mock>=1.2
-flake8>=2.2.4,<=2.4.1
-stestr>=2.2.0
-requests>=2.18.4
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of *requirements.txt files for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

src/tox.ini

@@ -1,16 +1,22 @@
+# Source charm (with zaza): ./src/tox.ini
+# This file is managed centrally by release-tools and should not be modified
+# 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
 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]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 whitelist_externals = juju
-passenv = HOME TERM CS_API_* OS_* TEST_*
+passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install {opts} {packages}
@@ -23,7 +29,7 @@ commands = charm-proof
 [testenv:func-noop]
 basepython = python3
 commands =
-    true
+    functest-run-suite --help
 
 [testenv:func]
 basepython = python3

test-requirements.txt

@@ -12,3 +12,12 @@ mock>=1.2
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+#
+# Revisit for removal / mock improvement:
+netifaces        # vault
+psycopg2-binary  # vault
+tenacity         # vault
+pbr              # vault
+cryptography     # vault, keystone-saml-mellon
+lxml             # keystone-saml-mellon
+hvac             # vault, barbican-vault

tox.ini

@@ -1,12 +1,15 @@
 # Source charm: ./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]
 skipsdist = True
 envlist = pep8,py3
-# 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]
@@ -14,8 +17,9 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
          LAYER_PATH={toxinidir}/layers
+         INTERFACE_PATH={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build
-passenv = http_proxy https_proxy INTERFACE_PATH
+passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
   pip install {opts} {packages}
 deps =
@@ -29,22 +33,27 @@ commands =
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+commands = stestr run --slowest {posargs}
 
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+commands = stestr run --slowest {posargs}
 
 [testenv:py36]
 basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+commands = stestr run --slowest {posargs}
 
 [testenv:py37]
 basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+commands = stestr run --slowest {posargs}
+
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -62,7 +71,7 @@ setenv =
     PYTHON=coverage run
 commands =
     coverage erase
-    stestr run {posargs}
+    stestr run --slowest {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml
@@ -85,4 +94,4 @@ commands = {posargs}
 
 [flake8]
 # E402 ignore necessary for path append before sys module import in actions
-ignore = E402
+ignore = E402,W504