split out k8s and api functional testing
This patch splits out api and functional testing case to different directory, and modify post_test_hook.sh to passing a parameter to calling different tox venv. Depends-On: I10e09b2deea7a0643a9516701994cc47813e1aaa Partially implements: blueprint split-gate-functional-dsvm-magnum Change-Id: Ic33ea42f6108c7444c152706458cf1a686ed1756
This commit is contained in:
parent
38610a478f
commit
eb5eaa503d
|
@ -96,8 +96,11 @@ echo_summary "Create a flavor"
|
||||||
nova flavor-create m1.magnum 100 2048 8 1
|
nova flavor-create m1.magnum 100 2048 8 1
|
||||||
|
|
||||||
# Run functional tests
|
# Run functional tests
|
||||||
echo "Running magnum functional test suite"
|
|
||||||
sudo -E -H -u jenkins tox -e functional -- --concurrency=1
|
# Currently we support functional-api, functional-k8s, will support swarm,
|
||||||
|
# mesos later.
|
||||||
|
echo "Running magnum functional test suite for $1"
|
||||||
|
sudo -E -H -u jenkins tox -e functional-$1 -- --concurrency=1
|
||||||
EXIT_CODE=$?
|
EXIT_CODE=$?
|
||||||
|
|
||||||
# Delete the keypair used in the functional test.
|
# Delete the keypair used in the functional test.
|
||||||
|
|
14
tox.ini
14
tox.ini
|
@ -17,9 +17,19 @@ commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
bash tools/pretty_tox.sh '{posargs}'
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional-api]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
setenv = OS_TEST_PATH=./magnum/tests/functional
|
setenv = OS_TEST_PATH=./magnum/tests/functional/api
|
||||||
|
OS_TEST_TIMEOUT=7200
|
||||||
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
|
commands =
|
||||||
|
find . -type f -name "*.pyc" -delete
|
||||||
|
bash tools/pretty_tox.sh '{posargs}'
|
||||||
|
|
||||||
|
[testenv:functional-k8s]
|
||||||
|
sitepackages = True
|
||||||
|
setenv = OS_TEST_PATH=./magnum/tests/functional/k8s
|
||||||
OS_TEST_TIMEOUT=7200
|
OS_TEST_TIMEOUT=7200
|
||||||
deps =
|
deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
|
|
Loading…
Reference in New Issue