Add disco-stein bundle to gate tests

The bundle disco-stein was in the dev bundles because
a bug with the Python 3.7 syntax prevented the success of
the deployment of HA clusters. This bug is fixed, we can
reintegrate disco-stein in the gate bundles.

Other small additions:
- changed the location of memcached dur to an issue with the charm store
- removing sitepackages in tox.ini to avoid test env pollution
- skip_missing_interpreters in tox.ini set to False to avoid false
positives by skipping missing interpreters.

LP Related-Bug: #1823718

Change-Id: Idf5e729fcde85ff7442282a711130f4132e17a85
This commit is contained in:
Camille Rodriguez 2019-08-26 14:28:31 -04:00
parent 2d5a29434f
commit e7b916b908
6 changed files with 15 additions and 3 deletions

1
.gitignore vendored
View File

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

View File

@ -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'}}])

View File

@ -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}

3
src/wheelhouse.txt Normal file
View File

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

View File

@ -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