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 minor adds:
- Changing naming convention for vip: 'Amulet' is deprecated.
- Passing OS env vars

LP Related-Bug: #1823719
Change-Id: I787248ad2983858c6db2e5a838270a128dae717a
This commit is contained in:
Camille Rodriguez 2019-08-23 14:15:52 -04:00
parent c496f368f7
commit 1497395cde
4 changed files with 5 additions and 7 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ func-results.json
.local .local
__pycache__ __pycache__
.stestr .stestr
.idea

View File

@ -2,7 +2,7 @@
applications: applications:
keystone: keystone:
options: options:
vip: {{ AMULET_OS_VIP00 }} vip: '{{ OS_VIP00 }}'
hacluster: hacluster:
charm: cs:~openstack-charmers-next/hacluster charm: cs:~openstack-charmers-next/hacluster
num_units: 0 num_units: 0

View File

@ -2,6 +2,7 @@ charm_name: keystone
smoke_bundles: smoke_bundles:
- bionic-stein - bionic-stein
gate_bundles: gate_bundles:
- disco-stein
- bionic-stein - bionic-stein
- bionic-rocky - bionic-rocky
- bionic-queens - bionic-queens
@ -10,10 +11,7 @@ gate_bundles:
- xenial-ocata - xenial-ocata
- xenial-mitaka - xenial-mitaka
- trusty-mitaka - trusty-mitaka
dev_bundles: comment:
- disco-stein
comment: |
disable ``disco-stein`` test pending LP: #1823718
the glance configure job validates operation of identity-service relation the glance configure job validates operation of identity-service relation
configure: configure:
- zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.glance.setup.add_lts_image

View File

@ -9,12 +9,11 @@ skipsdist = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
CHARM_DIR={envdir} CHARM_DIR={envdir}
AMULET_SETUP_TIMEOUT=5400
install_command = install_command =
pip install {opts} {packages} pip install {opts} {packages}
commands = stestr run {posargs} commands = stestr run {posargs}
whitelist_externals = juju whitelist_externals = juju
passenv = HOME TERM AMULET_* CS_API_* passenv = HOME TERM CS_API_* OS_*
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
[testenv:py35] [testenv:py35]