Merge "Limit the substitution of ' in env vars"

[functest.git] / functest / utils / functest_utils.py

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 1879e69..12d8e90 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -23,6 +23,7 @@ import requests
 import yaml
 from git import Repo
 
+from functest.utils import decorators
 import functest.utils.functest_logger as ft_logger
 
 logger = ft_logger.Logger("functest_utils").getLogger()
@@ -94,8 +95,9 @@ def get_scenario():
     try:
         scenario = os.environ['DEPLOY_SCENARIO']
     except KeyError:
-        logger.error("Impossible to retrieve the scenario")
-        scenario = "Unknown_scenario"
+        logger.info("Impossible to retrieve the scenario."
+                    "Use default os-nosdn-nofeature-noha")
+        scenario = "os-nosdn-nofeature-noha"
 
     return scenario
 
@@ -126,7 +128,7 @@ def get_pod_name():
     try:
         return os.environ['NODE_NAME']
     except KeyError:
-        logger.error(
+        logger.info(
             "Unable to retrieve the POD name from environment. " +
             "Using pod name 'unknown-pod'")
         return "unknown-pod"
@@ -139,8 +141,8 @@ def get_build_tag():
     try:
         build_tag = os.environ['BUILD_TAG']
     except KeyError:
-        logger.error("Impossible to retrieve the build tag")
-        build_tag = "unknown_build_tag"
+        logger.info("Impossible to retrieve the build tag")
+        build_tag = "none"
 
     return build_tag
 
@@ -181,6 +183,7 @@ def logger_test_results(project, case_name, status, details):
             'd': details})
 
 
+@decorators.can_dump_request_to_file
 def push_results_to_db(project, case_name,
                        start_date, stop_date, criteria, details):
     """