From e562c9184e96579af0e7dbe202b9c74be5d17bc5 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Mon, 20 Mar 2017 13:53:06 +0200 Subject: Sould not set BUILD_ID in Jenkins (https://wiki.jenkins-ci.org/display/JENKINS/ProcessTreeKiller) Change-Id: I0a539ab767217f19dda612d262255ce7a9afb1e7 Signed-off-by: Yaroslav Brustinov --- scripts/automation/regression/aggregate_results.py | 4 ++-- scripts/automation/regression/trex_unit_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/automation/regression/aggregate_results.py b/scripts/automation/regression/aggregate_results.py index 05bb001e..53e9b1cd 100755 --- a/scripts/automation/regression/aggregate_results.py +++ b/scripts/automation/regression/aggregate_results.py @@ -261,7 +261,7 @@ if __name__ == '__main__': scenario = os.environ.get('SCENARIO') build_url = os.environ.get('BUILD_URL') - build_id = os.environ.get('BUILD_ID') + build_id = os.environ.get('BUILD_NUM') trex_repo = os.environ.get('TREX_CORE_REPO') last_commit_info_file = os.environ.get('LAST_COMMIT_INFO') last_commit_branch_file = os.environ.get('LAST_COMMIT_BRANCH') @@ -272,7 +272,7 @@ if __name__ == '__main__': if not build_url: print('Warning: no environment variable BUILD_URL') if not build_id: - print('Warning: no environment variable BUILD_ID') + print('Warning: no environment variable BUILD_NUM') if not python_ver: print('Warning: no environment variable PYTHON_VER') diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 8c07498a..a28f1d80 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -458,7 +458,7 @@ class CTRexTestConfiguringPlugin(Plugin): elk_info['info'] =info; elk_info['timestamp'] = timestamp.strftime("%Y-%m-%d %H:%M:%S") # need to update it - elk_info['build_id'] = os.environ.get('BUILD_ID') + elk_info['build_id'] = os.environ.get('BUILD_NUM') elk_info['scenario'] = os.environ.get('SCENARIO') CTRexScenario.elk_info = elk_info -- cgit 1.2.3-korg