Skip to content

Commit ef42a24

Browse files
committed
added tests for ansible 2.x.
removed travis virtualenv.
1 parent 7b2e13b commit ef42a24

File tree

1 file changed

+7
-30
lines changed

1 file changed

+7
-30
lines changed

tox.ini

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,23 @@
11
[tox]
22
envlist =
3-
# {py27}-{ansible193,ansible184,ansible172,ansible1610,ansible155,ansible145,ansible134,ansible123}
4-
{py27}-{ansible193,ansible184}
3+
py{27}-ansible{21,20,19}
54

65
skipsdist = True
76

87

98
[testenv]
109
changedir = tests
1110
deps =
12-
travis: ansible==1.9.3
13-
ansible193: ansible==1.9.3
14-
ansible184: ansible==1.8.4
11+
travis: ansible
12+
ansible21: ansible>=2.1,<2.2
13+
ansible20: ansible>=2.0.0,<2.1
14+
ansible19: ansible>=1.9.0,<2.0
1515

16-
passenv = ANSIBLE_ASK_SUDO_PASS HOME
16+
passenv = ANSIBLE_ASK_SUDO_PASS HOME LANG LC_ALL
1717

1818
commands =
19-
bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml || true"
19+
bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml --roles-path=dependencies || true"
2020
bash vagrant.sh {posargs}
2121

2222
whitelist_externals =
2323
bash
24-
25-
26-
[testenv:travis]
27-
passenv = ANSIBLE_ASK_SUDO_PASS HOME TRAVIS
28-
29-
commands =
30-
bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml || true"
31-
ansible-playbook -i localhost, --connection=local test.yml {posargs} --skip-tags=test
32-
bash test_idempotence.sh --env travis
33-
34-
whitelist_externals =
35-
ansible-playbook
36-
bash
37-
38-
39-
[testenv:docs]
40-
# sphinx documentation checks
41-
changedir = docs
42-
deps =
43-
Sphinx
44-
45-
commands =
46-
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

0 commit comments

Comments
 (0)