Use tests repo for common role test requirements

Code Issues Proposed changes

Using tox for requirements management requires in-repo
requirements files for all our repositories. Rather than
do that, we make use of the tests repo to capture our
common requirements and use this to install them.
This reduces our review requirement rate and simplifies
maintenance for us for the tox config. It also makes it
usable with 'Depends-On', which is marvellous!
The tox requirements definitions for docs/releasenotes
builds are left in-place as those are standard entries
across the community. If that changes at some point, we
can re-assess those entries too.
Depends-On: https://review.openstack.org/579208
Change-Id: I608e108801ed0e913185c2a29f57bde52112dd35

This commit is contained in:

Jesse Pretorius

2018年07月01日 17:07:10 +01:00

parent 3655714c17

commit dfcb48c0e0

2 changed files with 1 additions and 32 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

9
test-requirements.txt

View File

@@ -1,9 +0,0 @@

# The order of packages is significant, because pip processes them in the order

# of appearance. Changing the order has an impact on the overall integration

# process, which may cause wedges in the gate later.

bashate>=0.5.1 # Apache-2.0

flake8<2.6.0,>=2.5.4 # MIT

pyasn1!=0.2.3,>=0.1.8 # BSD

pyOpenSSL>=17.1.0 # Apache-2.0

requests>=2.14.2 # Apache-2.0

ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD

24
tox.ini

View File

@@ -8,8 +8,6 @@ envlist = docs,linters,functional

usedevelop = True

install_command =

 pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}

deps =

-r{toxinidir}/test-requirements.txt

commands =

/usr/bin/find . -type f -name "*.pyc" -delete

passenv =

@@ -73,37 +71,22 @@ commands =

bash -c "{toxinidir}/tests/common/test-bashate.sh"

[testenv:ansible]

deps =

{[testenv]deps}

-rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt

-rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt

[testenv:ansible-syntax]

deps =

{[testenv:ansible]deps}

commands =

bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"

[testenv:ansible-lint]

deps =

{[testenv:ansible]deps}

commands =

bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"

[testenv:functional]

deps =

{[testenv:ansible]deps}

commands =

bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"

[testenv:upgrade]

deps =

{[testenv:ansible]deps}

setenv =

{[testenv]setenv}

TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml

@@ -113,8 +96,6 @@ commands =

[testenv:func_lxd]

deps =

{[testenv:ansible]deps}

setenv =

{[testenv]setenv}

ANSIBLE_OVERRIDES={toxinidir}/tests/os_nova-overrides-lxd.yml

@@ -123,8 +104,6 @@ commands =

[testenv:ssl]

deps =

{[testenv:ansible]deps}

setenv =

{[testenv]setenv}

ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True

@@ -133,9 +112,8 @@ commands =

[testenv:linters]

deps =

{[testenv:ansible]deps}

commands =

bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"

{[testenv:pep8]commands}

{[testenv:bashate]commands}

{[testenv:ansible-lint]commands}