diff --git a/scripts/result_server/send_results.sh b/scripts/result_server/send_results.sh index 23597e0..f027636 100644 --- a/scripts/result_server/send_results.sh +++ b/scripts/result_server/send_results.sh @@ -113,7 +113,7 @@ log_result_summary() { if ! jq -r ' def field_value: if . == null or . == "" then "-" else tostring end; - "Result summary: code=\(.code | field_value) system=\(.system | field_value) mode=\(.execution_mode | field_value) exp=\(.exp | field_value) fom=\(.fom | field_value) pipeline=\(.pipeline_id | field_value)" + "Result summary: code=\(.code | field_value) system=\(.system | field_value) mode=\(.execution_mode | field_value) exp=\((.Exp // .exp) | field_value) fom=\((.FOM // .fom) | field_value) pipeline=\(.pipeline_id | field_value)" ' "$json_file" 2>/dev/null; then echo "Result summary: unavailable" fi diff --git a/scripts/tests/test_process_and_send_results.sh b/scripts/tests/test_process_and_send_results.sh index 992b65e..ce7d3ca 100644 --- a/scripts/tests/test_process_and_send_results.sh +++ b/scripts/tests/test_process_and_send_results.sh @@ -172,8 +172,7 @@ jq -e ' ' "${TMP_DIR}/project/send_results_workspace/results/result0.json" >/dev/null jq -e '."result0.json".uuid == "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"' \ "${TMP_DIR}/project/send_results_workspace/results/server_result_meta.json" >/dev/null -grep -q "Result summary: code=qws system=Fugaku mode=cross" "${TMP_DIR}/process.log" -grep -q "pipeline=12345" "${TMP_DIR}/process.log" +grep -q "Result summary: code=qws system=Fugaku mode=cross exp=CASE0 fom=1.25 pipeline=12345" "${TMP_DIR}/process.log" if grep -q '"environment_snapshot"' "${TMP_DIR}/process.log"; then echo "process log should not include full result JSON" >&2 exit 1