Merge "Add disco-stein bundle to gate tests"

.gitignore

@@ -6,3 +6,4 @@ interfaces
 .stestr
 *__pycache__*
 *.pyc
+.idea

src/tests/basic_deployment.py

@@ -63,7 +63,8 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
         if self._get_openstack_release() >= self.xenial_queens:
             other_services.extend([
                 {'name': 'gnocchi'},
-                {'name': 'memcached', 'location': 'cs:memcached'},
+                {'name': 'memcached',
+                 'location': 'cs:~memcached-team''/memcached'},
                 {'name': 'ceph-mon', 'units': 3},
                 {'name': 'ceph-osd', 'units': 3,
                  'storage': {'osd-devices': 'cinder,10G'}}])

src/tox.ini

@@ -4,6 +4,10 @@
 [tox]
 envlist = pep8
 skipsdist = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}

src/wheelhouse.txt

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

tox.ini

@@ -4,7 +4,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py37
-skip_missing_interpreters = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -44,7 +47,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests