Merge "Ignore rally_conf.json"

[functest.git] / ci / prepare_env.py

diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 63a0ad4..e110aa5 100755 (executable)
--- 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)
@@ -222,7 +223,7 @@ def install_rally():
     logger.info("Creating Rally environment...")
 
     cmd = "rally deployment destroy opnfv-rally"
-    ft_utils.execute_command(cmd, exit_on_error=False,
+    ft_utils.execute_command(cmd,
                              error_msg=("Deployment %s does not exist."
                                         % DEPLOYMENT_MAME), verbose=False)
     rally_conf = os_utils.get_credentials_for_rally()