diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-26 01:23:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 01:23:28 -0500 |
| commit | c12b00944940cd7f425323e1598a4b7683ddaf75 (patch) | |
| tree | d1cb21b763579a5c5a2fa5dd0c30078b7383bbe7 /tox.ini | |
| parent | 760bdbc78081d9780d2618c422f31913dd9d38c7 (diff) | |
| parent | e5f14b515b07bcfa2079c3e68c35fee3e97970c7 (diff) | |
| download | openshift-c12b00944940cd7f425323e1598a4b7683ddaf75.tar.gz openshift-c12b00944940cd7f425323e1598a4b7683ddaf75.tar.bz2 openshift-c12b00944940cd7f425323e1598a4b7683ddaf75.tar.xz openshift-c12b00944940cd7f425323e1598a4b7683ddaf75.zip | |
Merge pull request #3816 from sosiouxme/20170328-integration-tests
Merged by openshift-bot
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3,6 +3,7 @@ minversion=2.3.1 envlist = py{27,35}-{flake8,pylint,unit} py27-{yamllint,ansible_syntax,generate_validation} + integration skipsdist=True skip_missing_interpreters=True @@ -12,6 +13,7 @@ deps = -rrequirements.txt -rtest-requirements.txt py35-flake8: flake8-bugbear==17.3.0 + integration: docker-py==1.10.6 commands = unit: pip install -e utils @@ -22,3 +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 + # 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 |