openstack
/
neutron
Code Issues Proposed changes

Allow to control to use constraint env for functional jobs 

VPNaaS functional tests now use dsvm-functional instead of
*-constraints. Always assuming *-constraints breaks the functional
jobs which is not run in a constrainted environment yet.

Paritial-Bug: #1529027
Change-Id: I3a4f1d61d13f1e444f7624d68d121d04d81eb724
This commit is contained in:
Akihiro Motoki 2015-12-25 23:27:03 +09:00
parent f95dce7785
commit 477b390b32
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/configure_for_func_testing.sh
View File

@ -19,6 +19,7 @@ set -e
# Control variable used to determine whether to execute this script
# directly or allow the gate_hook to import.
IS_GATE=${IS_GATE:-False}
USE_CONSTRAINT_ENV=${USE_CONSTRAINT_ENV:-True}
if [[ "$IS_GATE" != "True" ]] && [[ "$#" -lt 1 ]]; then
@ -51,7 +52,7 @@ done
# when sourcing.
VENV=${VENV:-dsvm-functional}
# If executed in the gate, run in a constrained env
if [[ "$IS_GATE" == "True" ]]
if [[ "$IS_GATE" == "True" && "$USE_CONSTRAINT_ENV" == "True" ]]
then
VENV=$VENV-constraints
fi