From 477b390b328e4e66a2242d346a08b81a29408908 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 25 Dec 2015 23:27:03 +0900 Subject: [PATCH] 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 --- tools/configure_for_func_testing.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh index 684e4902610..d434af4d096 100755 --- 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