summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-09-14 14:32:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-14 14:32:45 +0000
commit5757d9856036a1afff04c1cd12187251a5fc48f5 (patch)
tree7811dd5d016f9ccb7d0510f00aa622a51202fb4d
parent069e45d6e4d37b292580671b685b50d8235f4dc5 (diff)
parentfd4a8b8af7ef5994c21471f2085dbae33d724fc7 (diff)
Merge "Added missing parameter into logger warning message" into stable/colorado
-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)