From 5a91c3548370d3de856e5522f2d11775278115cf Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Fri, 31 Oct 2014 18:48:00 +0100 Subject: [PATCH] USe `trueorfalse` for INSTALL_TESTONLY_PACKAGES INSTALL_TESTONLY_PACKAGES is assumed to be set to `True` or `False`. However, in devstack-gate this variable is set to 0 or 1. The patch uses the already existing `trueorfalse` function to evaluate INSTALL_TESTONLY_PACKAGES and normalize its value. Change-Id: I0e4a31e422bad2a31d919d9f871e24833a0faa99 --- functions-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions-common b/functions-common index 48edba8da6..b9eaae5db3 100644 --- a/functions-common +++ b/functions-common @@ -993,6 +993,8 @@ function get_packages { local file_to_parse local service + INSTALL_TESTONLY_PACKAGES=$(trueorfalse False $INSTALL_TESTONLY_PACKAGES) + if [[ -z "$package_dir" ]]; then echo "No package directory supplied" return 1 @@ -1599,6 +1601,7 @@ function pip_install { $cmd_pip install \ $pip_mirror_opt $@ + INSTALL_TESTONLY_PACKAGES=$(trueorfalse False $INSTALL_TESTONLY_PACKAGES) if [[ "$INSTALL_TESTONLY_PACKAGES" == "True" ]]; then local test_req="$@/test-requirements.txt" if [[ -e "$test_req" ]]; then