summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-07-18 10:06:17 -0400
committerGitHub <noreply@github.com>2017-07-18 10:06:17 -0400
commit8d9c90f827b0042465cf96ea10eb170a6bae3107 (patch)
treea044b194dd24675048de45855a4a811dfc12e9d1 /tox.ini
parenta41fc449c3e56646365701e5b7a40b29eb9e3b67 (diff)
parent2f592c0520369dc84c5163dea0255448cb7c9f70 (diff)
downloadopenshift-8d9c90f827b0042465cf96ea10eb170a6bae3107.tar.gz
openshift-8d9c90f827b0042465cf96ea10eb170a6bae3107.tar.bz2
openshift-8d9c90f827b0042465cf96ea10eb170a6bae3107.tar.xz
openshift-8d9c90f827b0042465cf96ea10eb170a6bae3107.zip
Merge pull request #4764 from sdodson/ansible-2-3
Merged by openshift-bot
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini7
1 files changed, 1 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index bd27ba313..cc17377ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,9 +24,4 @@ commands =
generate_validation: python setup.py generate_validation
# TODO(rhcarvalho): check syntax of other important entrypoint playbooks
ansible_syntax: python setup.py ansible_syntax
- # 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
+ integration: python -c 'print "run test/integration/run-tests.sh"'