summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini14
1 files changed, 7 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index 6755dc625..bd27ba313 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,7 @@ deps =
-rrequirements.txt
-rtest-requirements.txt
py35-flake8: flake8-bugbear==17.3.0
-
-whitelist_externals = env
+ integration: docker-py==1.10.6
commands =
unit: pip install -e utils
@@ -25,8 +24,9 @@ commands =
generate_validation: python setup.py generate_validation
# TODO(rhcarvalho): check syntax of other important entrypoint playbooks
ansible_syntax: python setup.py ansible_syntax
-
- # Unset GOPATH because tests use relative imports. This should be removed if
- # we require openshift-ansible to live in a Go work space and use absolute
- # imports in tests (desirable).
- integration: env -u GOPATH go test -v ./test/integration/...
+ # ansible 2.2.2+ unfortunately breaks the integration test runner
+ # because it can no longer set facts on the test docker hosts.
+ # So for now, install separate ansible version for integration.
+ # PR that fixes it: https://github.com/ansible/ansible/pull/23599
+ # Once that PR is available, drop this and use same ansible.
+ integration: pip install ansible==2.2.1.0