diff --git a/scripts/publish_test_metrics.py b/scripts/publish_test_metrics.py index c6d38ee..968f292 100755 --- a/scripts/publish_test_metrics.py +++ b/scripts/publish_test_metrics.py @@ -283,14 +283,22 @@ def main() -> int: if branch.startswith("origin/"): branch = branch[len("origin/") :] build_number = os.getenv("BUILD_NUMBER", "") + jenkins_job = os.getenv("JOB_NAME", "pegasus") commit = os.getenv("GIT_COMMIT", "") labels = { "suite": suite, "branch": branch, "build_number": build_number, + "jenkins_job": jenkins_job, "commit": commit, } + test_case_base_labels = { + "suite": suite, + "branch": branch, + "build_number": build_number or "unknown", + "jenkins_job": jenkins_job, + } gate_ok = bool(gate_summary.get("ok")) gate_issues = gate_summary.get("issues") or [] source_lines_over_500 = _count_source_files_over_limit(repo_root, max_lines=500) @@ -361,7 +369,7 @@ def main() -> int: f"pegasus_quality_gate_build_info{_label_str(labels)} 1", ] payload_lines.extend( - f'platform_quality_gate_test_case_result{{suite="{suite}",test="{_escape_label(test_name)}",status="{_escape_label(test_status)}"}} 1' + f"platform_quality_gate_test_case_result{_label_str({**test_case_base_labels, 'test': test_name, 'status': test_status})} 1" for test_name, test_status in test_cases ) payload_lines.extend(