Merge "Modified tox.ini and post_test_hook.sh"
This commit is contained in:
commit
fa365a6cb4
|
@ -3,7 +3,7 @@
|
|||
set -xe
|
||||
|
||||
NEUTRON_LBAAS_DIR="$BASE/new/neutron-lbaas"
|
||||
TEMPEST_DIR="$BASE/new/tempest"
|
||||
TEMPEST_CONFIG_DIR="$BASE/new/tempest/etc"
|
||||
SCRIPTS_DIR="/usr/local/jenkins/slave_scripts"
|
||||
|
||||
testenv=${1:-"apiv2"}
|
||||
|
@ -28,8 +28,6 @@ function generate_testr_results {
|
|||
}
|
||||
|
||||
owner=tempest
|
||||
# Configure the api tests to use the tempest.conf set by devstack.
|
||||
sudo cp $TEMPEST_DIR/etc/tempest.conf $NEUTRON_LBAAS_DIR/neutron_lbaas/tests/tempest/etc
|
||||
|
||||
# Set owner permissions according to job's requirements.
|
||||
cd $NEUTRON_LBAAS_DIR
|
||||
|
@ -37,6 +35,9 @@ sudo chown -R $owner:stack $NEUTRON_LBAAS_DIR
|
|||
|
||||
sudo_env=" OS_TESTR_CONCURRENCY=1"
|
||||
|
||||
# Configure the api tests to use the tempest.conf set by devstack
|
||||
sudo_env+=" TEMPEST_CONFIG_DIR=$TEMPEST_CONFIG_DIR"
|
||||
|
||||
if [ "$testenv" = "apiv2" ]; then
|
||||
sudo_env+=" OS_TEST_PATH=$NEUTRON_LBAAS_DIR/neutron_lbaas/tests/tempest/v2/api"
|
||||
elif [ "$testenv" = "apiv1" ]; then
|
||||
|
|
13
tox.ini
13
tox.ini
|
@ -83,7 +83,7 @@ sitepackages = True
|
|||
setenv =
|
||||
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
|
||||
OS_TESTR_CONCURRENCY=1
|
||||
TEMPEST_CONFIG_DIR={toxinidir}/neutron_lbaas/tests/tempest/etc
|
||||
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
|
||||
|
||||
[testenv:apiv2]
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
|
@ -92,4 +92,13 @@ sitepackages = True
|
|||
setenv =
|
||||
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
|
||||
OS_TESTR_CONCURRENCY=1
|
||||
TEMPEST_CONFIG_DIR={toxinidir}/neutron_lbaas/tests/tempest/etc
|
||||
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
|
||||
|
||||
[testenv:scenario]
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
sitepackages = True
|
||||
setenv =
|
||||
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
|
||||
OS_TESTR_CONCURRENCY=1
|
||||
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
|
||||
|
|
Loading…
Reference in New Issue