Merge "Create stdout and stderr files for Tempest results"

1 files changed, 18 insertions, 7 deletions

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
index 0097a567b..50dd2521c 100644
--- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py
@@ -21,6 +21,7 @@ import re
 import requests
 import subprocess
 import sys
+import time
 import yaml
 import keystoneclient.v2_0.client as ksclient
 from neutronclient.v2_0 import client as neutronclient
@@ -220,13 +221,23 @@ def run_tempest(OPTION):
     else:
         if not os.path.exists(TEMPEST_RESULTS_DIR):
             os.makedirs(TEMPEST_RESULTS_DIR)
-
-        f = open(TEMPEST_RESULTS_DIR+"/tempest.log", 'w+')
-        FNULL = open(os.devnull, 'w')
-
-        subprocess.call(cmd_line, shell=True, stdout=FNULL, stderr=f)
-        f.close()
-        FNULL.close()
+        header = "Tempest environment:\n"\
+            "  Installer: %s\n  Scenario: %s\n  Node: %s\n  Date: %s\n" % \
+            (os.getenv('INSTALLER_TYPE','Unknown'), \
+             os.getenv('DEPLOY_SCENARIO','Unknown'), \
+             os.getenv('NODE_NAME','Unknown'), \
+             time.strftime("%a %b %d %H:%M:%S %Z %Y"))
+
+        f_stdout = open(TEMPEST_RESULTS_DIR+"/tempest.log", 'w+')
+        f_stderr = open(TEMPEST_RESULTS_DIR+"/tempest-error.log", 'w+')
+        f_env = open(TEMPEST_RESULTS_DIR+"/environment.log", 'w+')
+        f_env.write(header)
+
+        subprocess.call(cmd_line, shell=True, stdout=f_stdout, stderr=f_stderr)
+
+        f_stdout.close()
+        f_stderr.close()
+        f_env.close()
 
         cmd_line = "rally verify show"
         subprocess.call(cmd_line, shell=True)