Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/log_parser/generate_acs_summary.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# Copyright (c) 2026, Arm Limited or its affiliates. All rights reserved.
# Copyright (c) 2024-2026, Arm Limited or its affiliates. All rights reserved.
# SPDX-License-Identifier : Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
34 changes: 33 additions & 1 deletion common/log_parser/main_log_parser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ LOGS_PATH=$1
ACS_CONFIG_PATH=$2
SYSTEM_CONFIG_PATH=$3
WAIVER_JSON=$4
POST_SCRIPT_LOG="$LOGS_PATH/post-script/post-script.log"

if [ $YOCTO_FLAG_PRESENT -eq 1 ]; then
test_category="/usr/bin/log_parser/test_categoryDT.json"
Expand Down Expand Up @@ -443,7 +444,6 @@ fi
# POST-SCRIPT LOG PARSING
################################################################################
if [ $YOCTO_FLAG_PRESENT -eq 1 ]; then
POST_SCRIPT_LOG="$LOGS_PATH/post-script/post-script.log"
POST_SCRIPT_JSON="$JSONS_DIR/post_script.json"

# Attempt to parse post-script.log if it exists
Expand Down Expand Up @@ -605,6 +605,7 @@ fi
################################################################################
# OS TESTS PARSING
################################################################################
OS_JSONS=()
if [ $YOCTO_FLAG_PRESENT -eq 1 ]; then
OS_LOGS_PATH="$(dirname "$LOGS_PATH")/os-logs"
OS_JSONS_DIR="$JSONS_DIR"
Expand Down Expand Up @@ -655,6 +656,37 @@ if [ $YOCTO_FLAG_PRESENT -eq 1 ]; then
fi
fi

if [ $YOCTO_FLAG_PRESENT -eq 0 ]; then
OS_LOGS_PATH="$(dirname "$LOGS_PATH")/os-logs"
OS_JSONS_DIR="$JSONS_DIR"
mkdir -p "$OS_JSONS_DIR"
OS_JSONS=()

# SR band OS logs and post-script checks
SR_OS_LOGS_JSON="$OS_JSONS_DIR/os_test.json"
python3 "$SCRIPTS_PATH/os_tests/sr_logs_to_json.py" \
"$OS_LOGS_PATH" \
"$POST_SCRIPT_LOG" \
"$SR_OS_LOGS_JSON"
if [ $? -eq 0 ]; then
OS_JSONS+=("$SR_OS_LOGS_JSON")
apply_waivers "os Tests" "$SR_OS_LOGS_JSON"
OS_TESTS_PROCESSED=1
else
echo -e "${RED}ERROR: SR OS logs parsing to json failed.${NC}"
fi

if [ ${#OS_JSONS[@]} -gt 0 ]; then
OS_DETAILED_HTML="$HTMLS_DIR/os_tests_detailed.html"
OS_SUMMARY_HTML="$HTMLS_DIR/os_tests_summary.html"
python3 "$SCRIPTS_PATH/os_tests/json_to_html.py" \
"${OS_JSONS[@]}" \
"$OS_DETAILED_HTML" \
"$OS_SUMMARY_HTML" \
--include-drop-down
fi
fi

################################################################################
# UEFI version
################################################################################
Expand Down
5 changes: 5 additions & 0 deletions common/log_parser/merge_jsons.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
("SCT", "M"),
("FWTS", "M"),
("BSA", "M"),
("OS_TEST", "M"),
("BBSR-SCT", "EM"),
("BBSR-FWTS", "EM"),
("BBSR-TPM", "EM"),
Expand Down Expand Up @@ -362,6 +363,10 @@ def merge_json_files(json_files, output_file):
elif os.path.basename(json_path).lower() == "ethtool_test.json":
section_name = "Suite_Name: Ethtool Test"
suite_key = "ETHTOOL_TEST"
elif os.path.basename(json_path).lower() == "os_test.json":
section_name = "Suite_Name: OS Tests"
suite_key = "OS_TEST"
_REQUIREMENT_MAP["OS_TEST"] = "M"
elif "ethtool_test" in fn.lower():
base_name_no_ext = os.path.splitext(os.path.basename(json_path))[0]
section_name = f"Suite_Name: OS Tests - {base_name_no_ext}"
Expand Down
Loading