Added missing parameter into logger warning message 11/21111/1
authorvitikkan <viktor.tikkanen@nokia.com>
Wed, 14 Sep 2016 04:31:58 +0000 (07:31 +0300)
committerJose Lausuch <jose.lausuch@ericsson.com>
Wed, 14 Sep 2016 09:30:03 +0000 (09:30 +0000)
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)

ci/prepare_env.py

index 63a0ad4..6b1baba 100755 (executable)
@@ -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)