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

diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index 684e49026101f5ff3972cc28762194d2455c1fa7..d434af4d0967df97799ea30fd6525accfe8a0388 100755 (executable)
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -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