summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-09-14 07:31:58 +0300
committerJose Lausuch <jose.lausuch@ericsson.com>2016-09-14 09:30:03 +0000
commitfd4a8b8af7ef5994c21471f2085dbae33d724fc7 (patch)
treedc3a8874773123ca6e9d4e7acd26f1f93a2a4d83 /ci
parent3d012db86bbdfeb51ed5c6da52523fc2647dffb0 (diff)
Added missing parameter into logger warning message
Missing parameter prevented using of customer defined installer type when executing "functest env prepare" command. JIRA: FUNCTEST-467 Change-Id: I69b69fa43584ec7ae4e4d8925f99624711131ef9 Signed-off-by: vitikkan <viktor.tikkanen@nokia.com> (cherry picked from commit a2c1165dfa22e5645eff20d8758ead07b638ccf5)
Diffstat (limited to 'ci')
-rwxr-xr-xci/prepare_env.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 63a0ad4a8..6b1babaa8 100755
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -89,10 +89,11 @@ def check_env_variables():
logger.warning("The env variable 'INSTALLER_TYPE' is not defined.")
CI_INSTALLER_TYPE = "undefined"
else:
- if os.getenv('INSTALLER_TYPE') not in INSTALLERS:
+ if CI_INSTALLER_TYPE not in INSTALLERS:
logger.warning("INSTALLER_TYPE=%s is not a valid OPNFV installer. "
- "Available OPNFV Installers are : %s."
- "Setting INSTALLER_TYPE=undefined." % INSTALLERS)
+ "Available OPNFV Installers are : %s. "
+ "Setting INSTALLER_TYPE=undefined."
+ % (CI_INSTALLER_TYPE, INSTALLERS))
CI_INSTALLER_TYPE = "undefined"
else:
logger.info(" INSTALLER_TYPE=%s" % CI_INSTALLER_TYPE)