summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test-requirements.txt9
-rw-r--r--tox.ini18
2 files changed, 1 insertions, 26 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 2ad54bf..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
1# The order of packages is significant, because pip processes them in the order
2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later.
4bashate>=0.2 # Apache-2.0
5flake8<2.6.0,>=2.5.4 # MIT
6pyasn1>=0.1.8 # BSD
7pyOpenSSL>=0.14 # Apache-2.0
8requests>=2.14.2 # Apache-2.0
9ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD
diff --git a/tox.ini b/tox.ini
index f698536..80338a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,6 @@ envlist = docs,linters,functional
8usedevelop = True 8usedevelop = True
9install_command = 9install_command =
10 pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 10 pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
11deps =
12 -r{toxinidir}/test-requirements.txt
13commands = 11commands =
14 /usr/bin/find . -type f -name "*.pyc" -delete 12 /usr/bin/find . -type f -name "*.pyc" -delete
15passenv = 13passenv =
@@ -76,38 +74,24 @@ commands =
76 bash -c "{toxinidir}/tests/common/test-bashate.sh" 74 bash -c "{toxinidir}/tests/common/test-bashate.sh"
77 75
78 76
79[testenv:ansible]
80deps =
81 {[testenv]deps}
82 -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
83
84
85[testenv:ansible-syntax] 77[testenv:ansible-syntax]
86deps =
87 {[testenv:ansible]deps}
88commands = 78commands =
89 bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh" 79 bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
90 80
91 81
92[testenv:ansible-lint] 82[testenv:ansible-lint]
93deps =
94 {[testenv:ansible]deps}
95commands = 83commands =
96 bash -c "{toxinidir}/tests/common/test-ansible-lint.sh" 84 bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
97 85
98 86
99[testenv:functional] 87[testenv:functional]
100deps =
101 {[testenv:ansible]deps}
102commands = 88commands =
103 bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" 89 bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
104 90
105 91
106[testenv:linters] 92[testenv:linters]
107deps =
108 -r{toxinidir}/doc/requirements.txt
109 {[testenv:ansible]deps}
110commands = 93commands =
94 bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
111 {[testenv:pep8]commands} 95 {[testenv:pep8]commands}
112 {[testenv:bashate]commands} 96 {[testenv:bashate]commands}
113 {[testenv:ansible-lint]commands} 97 {[testenv:ansible-lint]commands}