From 504b0f99511f818e40580a803112999c4bf3984a Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Sun, 20 Nov 2016 14:19:31 +0200 Subject: regression - aggregate_results fixes #2 Signed-off-by: Yaroslav Brustinov --- scripts/automation/regression/aggregate_results.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/automation/regression/aggregate_results.py b/scripts/automation/regression/aggregate_results.py index 35c4b4e5..130e0545 100755 --- a/scripts/automation/regression/aggregate_results.py +++ b/scripts/automation/regression/aggregate_results.py @@ -262,6 +262,7 @@ if __name__ == '__main__': scenario = os.environ.get('SCENARIO') build_url = os.environ.get('BUILD_URL') build_id = os.environ.get('BUILD_ID') + trex_repo = os.environ.get('TREX_CORE_REPO') last_commit_info_file = os.environ.get('LAST_COMMIT_INFO') python_ver = os.environ.get('PYTHON_VER') if not scenario: @@ -293,11 +294,11 @@ if __name__ == '__main__': if last_commit_info_file and os.path.exists(last_commit_info_file): with open(last_commit_info_file) as f: trex_last_commit_info = f.read().strip().replace('\n', '
\n') - elif trex_last_commit_hash: + elif trex_last_commit_hash and trex_repo: try: command = 'git show %s -s' % trex_last_commit_hash print('Executing: %s' % command) - proc = subprocess.Popen(shlex.split(command), stdout = subprocess.PIPE, stderr = subprocess.STDOUT) + proc = subprocess.Popen(shlex.split(command), stdout = subprocess.PIPE, stderr = subprocess.STDOUT, cwd = trex_repo) (stdout, stderr) = proc.communicate() stdout = stdout.decode('utf-8', errors = 'replace') print('Stdout:\n\t' + stdout.replace('\n', '\n\t')) -- cgit 1.2.3-korg