summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-14 10:54:09 -0400
committerScott Dodson <sdodson@redhat.com>2017-07-17 12:00:53 -0400
commit2f592c0520369dc84c5163dea0255448cb7c9f70 (patch)
tree575a07fc6c43d9a7730898532e155e32c5e601c4
parentda7551b82fc37a77181a8c9aa9b82060b7101c5f (diff)
downloadopenshift-2f592c0520369dc84c5163dea0255448cb7c9f70.tar.gz
openshift-2f592c0520369dc84c5163dea0255448cb7c9f70.tar.bz2
openshift-2f592c0520369dc84c5163dea0255448cb7c9f70.tar.xz
openshift-2f592c0520369dc84c5163dea0255448cb7c9f70.zip
Switch CI to ansible-2.3.1.0
-rw-r--r--requirements.txt2
-rw-r--r--tox.ini7
2 files changed, 2 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt
index dae460713..bf95b4ff9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
# Versions are pinned to prevent pypi releases arbitrarily breaking
# tests with new APIs/semantics. We want to update versions deliberately.
-ansible==2.2.2.0
+ansible==2.3.1.0
boto==2.34.0
click==6.7
pyOpenSSL==16.2.0
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"'