summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2017-03-20 13:53:06 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2017-03-20 13:53:06 +0200
commite562c9184e96579af0e7dbe202b9c74be5d17bc5 (patch)
tree15ffeaa94a537317888c47f3e45f83ce0c1c1057
parent43a670557e64b938859b0f46d1b4decfb72510f1 (diff)
Sould not set BUILD_ID in Jenkins (https://wiki.jenkins-ci.org/display/JENKINS/ProcessTreeKiller)
Change-Id: I0a539ab767217f19dda612d262255ce7a9afb1e7 Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
-rwxr-xr-xscripts/automation/regression/aggregate_results.py4
-rwxr-xr-xscripts/automation/regression/trex_unit_test.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/automation/regression/aggregate_results.py b/scripts/automation/regression/aggregate_results.py
index 05bb001..53e9b1c 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 8c07498..a28f1d8 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