Update tox, reqs, stestr, zuul definitions

Change-Id: I08e00c008ed085e9c24e8c041b27b213d9ec21a4

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_dir=./

.testr.conf

@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - python-charm-jobs
-      - openstack-python35-jobs
+      - python35-charm-jobs
+      - openstack-cover-jobs

requirements.txt

@@ -1,4 +1,7 @@
-# Requirements to build the charm
-charm-tools
+# 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.
+#
+# Build requirements
+charm-tools>=2.4.4
 simplejson
-flake8

src/README.md

@@ -1,4 +1,6 @@
 # Overview
+**WARNING**:  This charm is in a preview/experimental state, not yet intended
+for production use.
 
 This charm provides the Panko event storage and API service for an OpenStack Cloud.
 

src/layer.yaml

@@ -3,4 +3,3 @@ repo: 'https://github.com/openstack/charm-panko'
 options:
   basic:
     use_venv: True
-    include_system_packages: True

src/test-requirements.txt

@@ -1,20 +1,33 @@
-# charm-proof
-charm-tools>=2.0.0
-# amulet deployment helpers
-git+https://github.com/juju/charm-helpers#egg=charmhelpers
+# 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
 # BEGIN: Amulet OpenStack Charm Helper Requirements
 # Liberty client lower constraints
-amulet>=1.14.3,<2.0
-bundletester>=0.6.1,<1.0
-python-keystoneclient>=1.7.1,<2.0
-python-designateclient>=1.5,<2.0
-python-cinderclient>=1.4.0,<2.0
-python-glanceclient>=1.1.0,<2.0
-python-heatclient>=0.8.0,<1.0
-python-neutronclient>=3.1.0,<4.0
-python-novaclient>=2.30.1,<3.0
-python-openstackclient>=1.7.0,<2.0
-python-swiftclient>=2.6.0,<3.0
+amulet>=1.14.3,<2.0;python_version=='2.7'
+bundletester>=0.6.1,<1.0;python_version=='2.7'
+aodhclient>=0.1.0
+gnocchiclient>=3.1.0,<3.2.0
+python-barbicanclient>=4.0.1
+python-ceilometerclient>=1.5.0
+python-cinderclient>=1.4.0
+python-designateclient>=1.5
+python-glanceclient>=1.1.0
+python-heatclient>=0.8.0
+python-keystoneclient>=1.7.1
+python-manilaclient>=1.8.1
+python-neutronclient>=3.1.0
+python-novaclient>=2.30.1
+python-openstackclient>=1.7.0
+python-swiftclient>=2.6.0
 pika>=0.10.0,<1.0
 distro-info
+git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
 # END: Amulet OpenStack Charm Helper Requirements
+pytz    # workaround for 14.04 pip/tox
+pyudev  # for ceph-* charm unit tests (not mocked?)

src/tox.ini

@@ -8,12 +8,12 @@ skipsdist = True
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
-         AMULET_SETUP_TIMEOUT=2700
+         AMULET_SETUP_TIMEOUT=5400
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
-  pip install --allow-unverified python-apt {opts} {packages}
+  pip install {opts} {packages}
 
 [testenv:pep8]
 basepython = python2.7

src/wheelhouse.txt

@@ -0,0 +1,2 @@
+jinja2
+psutil

test-requirements.txt

@@ -1,7 +1,13 @@
-# Unit test requirements
+# 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.
+#
+# Lint and unit test requirements
 flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
+stestr>=2.2.0
+requests>=2.18.4
 charms.reactive
 mock>=1.2
+nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack

tox.ini

@@ -3,62 +3,73 @@
 # within individual charm repos.
 [tox]
 skipsdist = True
-envlist = pep8,py34,py35,py27
-skip_missing_interpreters = True
-
-[bundleenv]
-setenv = VIRTUAL_ENV={envdir}
-         PYTHONHASHSEED=0
-         TERM=linux
-         LAYER_PATH={toxinidir}/layers
-         INTERFACE_PATH={toxinidir}/interfaces
-         JUJU_REPOSITORY={toxinidir}/build
-install_command =
-  pip install {opts} {packages}
-deps =
-    -r{toxinidir}/requirements.txt
+envlist = pep8,py3
 
 [testenv]
 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 CHARM_TEMPLATE_LOCAL_BRANCH
+passenv = http_proxy https_proxy INTERFACE_PATH
 install_command =
   pip install {opts} {packages}
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
-basepython = python2.7
+basepython = python3
 commands =
     charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
 
-[testenv:py27]
-basepython = python2.7
-# Reactive source charms are Python3-only, but a py27 unit test target
-# is required by OpenStack Governance.  Remove this shim as soon as
-# permitted.  http://governance.openstack.org/reference/cti/python_cti.html
-whitelist_externals = true
-commands = true
-
-[testenv:py34]
-basepython = python3.4
+[testenv:py3]
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
+
+[testenv:py36]
+basepython = python3.6
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests
 
+[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 {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}