diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-18 10:06:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 10:06:17 -0400 |
| commit | 8d9c90f827b0042465cf96ea10eb170a6bae3107 (patch) | |
| tree | a044b194dd24675048de45855a4a811dfc12e9d1 | |
| parent | a41fc449c3e56646365701e5b7a40b29eb9e3b67 (diff) | |
| parent | 2f592c0520369dc84c5163dea0255448cb7c9f70 (diff) | |
| download | openshift-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
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 7 |
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 @@ -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"' |