michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: scripts: Add run_id and run_attempt context on upload to ES

Browse source 
Optionally record run-id and run-attempt github context variables
as additional test suite environment properties on upload into
ElasticSearch to track re-runs of CI workflows.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
This commit is contained in:
Dmitrii Golovanov 2024-01-15 20:59:10 +01:00 • committed by Fabio Baltieri
commit 94e4addd07
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/ci/upload_test_results_es.py
View file

@ -14,7 +14,7 @@ import os
import json import json
import argparse import argparse
def gendata(f, index, run_date=None): def gendata(f, index, run_date=None, run_id=None, run_attempt=None):
with open(f, "r") as j: with open(f, "r") as j:
data = json.load(j) data = json.load(j)
for t in data['testsuites']: for t in data['testsuites']:
@ -25,6 +25,10 @@ def gendata(f, index, run_date=None):
env = data['environment'] env = data['environment']
if run_date: if run_date:
env['run_date'] = run_date env['run_date'] = run_date
if run_id:
env['run_id'] = run_id
if run_attempt:
env['run_attempt'] = run_attempt
t['environment'] = env t['environment'] = env
t['component'] = main_group t['component'] = main_group
t['sub_component'] = sub_group t['sub_component'] = sub_group
@ -57,7 +61,7 @@ def main():
if args.dry_run: if args.dry_run:
xx = None xx = None
for f in args.files: for f in args.files:
xx = gendata(f, index_name) xx = gendata(f, index_name, args.run_date, args.run_id, args.run_attempt)
for x in xx: for x in xx:
print(x) print(x)
sys.exit(0) sys.exit(0)
@ -74,7 +78,7 @@ def main():
if args.run_date: if args.run_date:
print(f"Setting run date from command line: {args.run_date}") print(f"Setting run date from command line: {args.run_date}")
for f in args.files: for f in args.files:
bulk(es, gendata(f, index_name, args.run_date)) bulk(es, gendata(f, index_name, args.run_date, args.run_id, args.run_attempt))
def parse_args(): def parse_args():
@ -83,6 +87,10 @@ def parse_args():
parser.add_argument('-c','--create-index', action="store_true", help='Create index.') parser.add_argument('-c','--create-index', action="store_true", help='Create index.')
parser.add_argument('-i', '--index', help='index to push to.', required=True) parser.add_argument('-i', '--index', help='index to push to.', required=True)
parser.add_argument('-r', '--run-date', help='Run date in ISO format', required=False) parser.add_argument('-r', '--run-date', help='Run date in ISO format', required=False)
parser.add_argument('--run-id', required=False,
help="unique run-id (e.g. from github.run_id context)")
parser.add_argument('--run-attempt', required=False,
help="unique run attempt number (e.g. from github.run_attempt context)")
parser.add_argument('files', metavar='FILE', nargs='+', help='file with test data.') parser.add_argument('files', metavar='FILE', nargs='+', help='file with test data.')
args = parser.parse_args() args = parser.parse_args()