diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 82506c5..0000000 --- a/test-requirements.txt +++ /dev/null @@ -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 diff --git a/tox.ini b/tox.ini index c391285..234036f 100755 --- a/tox.ini +++ b/tox.ini @@ -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:ssl] -deps = - {[testenv:ansible]deps} setenv = {[testenv]setenv} ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True @@ -112,9 +95,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}