Skip to content

Commit 4fcda82

Browse files
committed
get and log artifacts: fix error in parsing info.txt
Signed-off-by: Trecia Agoylo <[email protected]>
1 parent a369cf4 commit 4fcda82

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

telemetry/cli.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ def create_results_gist(server, job_name, build_number, board_name, github_gist_
217217
job_no = build_number,
218218
artifact_info_type = "info_txt",
219219
)
220+
if len(artifacts_info_txt) == 0:
221+
print(f"No artifacts_info_txt found for {job_name} - {build_number}")
222+
220223
built_projects = list()
221224
translated_built_projects = list()
222225
data = {}

telemetry/gparser/parser.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ def __init__(self, url, grabber):
415415
"(Triggered\sby):\s(.+)$",
416416
"(COMMIT\sSHA):\s(.+)$",
417417
"(COMMIT_DATE):\s(.+)$",
418-
"-\s([^:\s]+)$",
418+
"-\s([^:\n]+)$",
419419
]
420420
super(InfoTxt, self).__init__(url, grabber)
421421

@@ -460,7 +460,13 @@ def get_payload_parsed(self):
460460
x = re.search(p,l)
461461
if x and len(x.groups())==1:
462462
payload.append("Built projects")
463-
payload_param.append(x.group(1))
463+
# get the payload_param from the payload_raw
464+
# ex. payload_raw: - zynqmp-zcu102-rev10-adrv9025 (adrv9026_zcu102)
465+
# payload_param: zynqmp-zcu102-rev10-adrv9025
466+
project = re.search('^([\w-]+)(\s\(.*\))*',x.group(1))
467+
if not project:
468+
raise Exception("Cannot find project name in {}".format(x.group(1)))
469+
payload_param.append(project.group(1))
464470
elif x and len(x.groups())==2:
465471
payload.append(x.group(1))
466472
payload_param.append(x.group(2))

0 commit comments

Comments
 (0)