misc: setup gerrit integrations

Add zuul configuration.

Add gitreview configuration.

Normalise tox and requirements file definitions.

Change-Id: Icf657d939b9679b214c69a93f26611efeb6caf6d
This commit is contained in:
James Page 2020-04-16 16:55:34 +01:00
parent fd15a79520
commit 131a127d93
7 changed files with 46 additions and 51 deletions

2
.gitignore vendored
View File

@ -6,3 +6,5 @@ func-results.json
test-charm/ test-charm/
**/__pycache__ **/__pycache__
.stestr .stestr
.coverage
cover

4
.gitreview Normal file
View File

@ -0,0 +1,4 @@
[gerrit]
host=review.opendev.org
port=29418
project=openstack/charm-trilio-wlm.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,4 +1,3 @@
# Requirements to build the charm # Requirements to build the charm
charm-tools charm-tools
simplejson simplejson
flake8

View File

@ -1,20 +1,8 @@
# charm-proof # This file is managed centrally by release-tools and should not be modified
charm-tools>=2.0.0 # within individual charm repos. See the 'global' dir contents for available
# amulet deployment helpers # choices of *requirements.txt files for OpenStack Charms:
bzr+lp:charm-helpers#egg=charmhelpers # https://github.com/openstack-charmers/release-tools
# BEGIN: Amulet OpenStack Charm Helper Requirements #
# Liberty client lower constraints # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
amulet>=1.14.3,<2.0 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
bundletester>=0.6.1,<1.0 git+https://github.com/javacruft/zaza-openstack-tests.git@triliovault-testing#egg=zaza.openstack
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
pika>=0.10.0,<1.0
distro-info
# END: Amulet OpenStack Charm Helper Requirements

View File

@ -1,53 +1,50 @@
# Source charm: ./src/tox.ini # Source charm (with zaza): ./src/tox.ini
# This file is managed centrally by release-tools and should not be modified # This file is managed centrally by release-tools and should not be modified
# within individual charm repos. # within individual charm repos. See the 'global' dir contents for available
# choices of tox.ini for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
[tox] [tox]
envlist = pep8 envlist = pep8
skipsdist = True skipsdist = True
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False
[testenv] [testenv]
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
AMULET_SETUP_TIMEOUT=2700
whitelist_externals = juju whitelist_externals = juju
passenv = HOME TERM AMULET_* passenv = HOME TERM CS_* OS_* TEST_*
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
install_command = install_command =
pip install --allow-unverified python-apt {opts} {packages} pip install {opts} {packages}
[testenv:pep8] [testenv:pep8]
basepython = python2.7 basepython = python3
deps=charm-tools
commands = charm-proof commands = charm-proof
[testenv:func27-noop] [testenv:func-noop]
# DRY RUN - For Debug basepython = python3
basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy functest-run-suite --help
[testenv:func27] [testenv:func]
# Run all gate tests which are +x (expected to always pass) basepython = python3
basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy functest-run-suite --keep-model
[testenv:func27-smoke] [testenv:func-smoke]
# Run a specific test as an Amulet smoke test (expected to always pass) basepython = python3
basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy functest-run-suite --keep-model --smoke
[testenv:func27-dfs] [testenv:func-target]
# Run all deploy-from-source tests which are +x (may not always pass!) basepython = python3
basepython = python2.7
commands = commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy functest-run-suite --keep-model --bundle {posargs}
[testenv:func27-dev]
# Run all development test targets which are +x (may not always pass!)
basepython = python2.7
commands =
bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dev-*" --no-destroy
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}

View File

@ -1,6 +1,6 @@
# Unit test requirements # Unit test requirements
flake8>=2.2.4 flake8>=2.2.4
os-testr>=0.4.1 stestr>=2.2.0
charms.reactive charms.reactive
mock>=1.2 mock>=1.2
coverage>=3.6 coverage>=3.6