openstack
/
magnum
Code Issues Proposed changes

Merge "Import environment variables from testenv"

This commit is contained in:
Jenkins 2016-11-10 08:04:31 +00:00 committed by Gerrit Code Review
parent 9ea401c55f 1c5da2e89c
commit b21551c2ba
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tox.ini
View File

@ -28,7 +28,8 @@ commands = oslo_debug_helper {posargs}
[testenv:functional-api] [testenv:functional-api]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/api setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/api
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}
@ -38,7 +39,8 @@ commands =
[testenv:functional-k8s] [testenv:functional-k8s]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/k8s setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/k8s
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}
@ -48,7 +50,8 @@ commands =
[testenv:functional-k8s-ironic] [testenv:functional-k8s-ironic]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/k8s_ironic setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/k8s_ironic
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}
@ -58,7 +61,8 @@ commands =
[testenv:functional-k8s-coreos] [testenv:functional-k8s-coreos]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/k8s_coreos setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/k8s_coreos
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}
@ -68,7 +72,8 @@ commands =
[testenv:functional-swarm] [testenv:functional-swarm]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/swarm setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/swarm
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}
@ -78,7 +83,8 @@ commands =
[testenv:functional-mesos] [testenv:functional-mesos]
sitepackages = True sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/mesos setenv = {[testenv]setenv}
OS_TEST_PATH=./magnum/tests/functional/mesos
OS_TEST_TIMEOUT=7200 OS_TEST_TIMEOUT=7200
deps = deps =
{[testenv]deps} {[testenv]deps}