misc: add gerrit integration configuration

Add zuul configuration.

Add gitreview configuration.

Drive by unit test fix.

Change-Id: I045ee7a0ad4a122511d779aa5924ac3afec2e821
This commit is contained in:
James Page 2020-04-20 11:33:22 +01:00
parent 841e3a3ff3
commit 469d0dc9ab
8 changed files with 22 additions and 30 deletions

4
.gitreview Normal file
View File

@ -0,0 +1,4 @@
[gerrit]
host=review.opendev.org
port=29418
project=openstack/charm-trilio-dm-api.git

5
.zuul.yaml Normal file
View File

@ -0,0 +1,5 @@
- project:
templates:
- python35-charm-jobs
- openstack-python3-ussuri-jobs
- openstack-cover-jobs

View File

@ -1,10 +1,3 @@
# 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
#
# Build requirements
charm-tools>=2.4.4
# importlib-resources 1.1.0 removed Python 3.5 support
importlib-resources<1.1.0
# Requirements to build the charm
charm-tools
simplejson

View File

@ -99,7 +99,9 @@ class DmapiCharm(charm.HAOpenStackCharm):
package_codenames = {
"dmapi": collections.OrderedDict([("3", "stein")]),
"python3-dmapi": collections.OrderedDict([("3", "stein")]),
"python3-dmapi": collections.OrderedDict(
[("3", "stein"), ("4", "train")]
),
}
def __init__(self, release=None, **kwargs):

View File

@ -5,4 +5,4 @@
#
# 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
git+https://github.com/javacruft/zaza-openstack-tests.git@triliovault-testing#egg=zaza.openstack

View File

@ -1,23 +1,7 @@
# 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
#
# Lint and unit test requirements
# Unit test requirements
flake8>=2.2.4
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.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
git+https://github.com/openstack/charms.openstack#egg=charms.openstack

View File

@ -50,6 +50,11 @@ basepython = python3.7
deps = -r{toxinidir}/test-requirements.txt
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
deps = -r{toxinidir}/test-requirements.txt

View File

@ -137,5 +137,4 @@ class TestDmapiHandlers(test_utils.PatchHelper):
handlers.render_config(args)
dmapi_charm.upgrade_if_available.assert_called_once_with((args,))
dmapi_charm.render_with_interfaces.assert_called_once_with((args,))
dmapi_charm.configure_tls.assert_called_once_with()
dmapi_charm.assess_status.assert_called_once_with()