From 634a8957e1cc29374a170aaa8c2113b8fbbfe7e4 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Fri, 4 Nov 2016 18:30:34 +0100 Subject: Add stub of preflight integration tests --- tox.ini | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 8678ff463..6755dc625 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -13,6 +14,8 @@ deps = -rtest-requirements.txt py35-flake8: flake8-bugbear==17.3.0 +whitelist_externals = env + commands = unit: pip install -e utils unit: pytest {posargs} @@ -22,3 +25,8 @@ 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/... -- cgit v1.2.3 From e5f14b515b07bcfa2079c3e68c35fee3e97970c7 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Tue, 4 Apr 2017 12:05:20 -0400 Subject: integration tests: add CI scripts Add some scripts that can be run from Jenkins to build/push test images and to run the tests. Updated README to expand on running tests. --- tox.ini | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tox.ini') 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 -- cgit v1.2.3