display git hash in the summary

kgraeper · kgraeper · commit d2093a2fff7c · 2025-11-17T10:52:25.000+01:00
diff --git a/integration_test.sh b/integration_test.sh
@@ -3,16 +3,70 @@ set -euo pipefail
 
 # Integration build script.
 # Captures warning counts for regression tracking.
+#
+# Usage: ./integration_test.sh [--known-good <path>]
+#   --known-good: Optional path to known_good.json file
 
 CONFIG=${CONFIG:-bl-x86_64-linux}
 LOG_DIR=${LOG_DIR:-_logs/logs}
 SUMMARY_FILE=${SUMMARY_FILE:-_logs/build_summary.md}
+KNOWN_GOOD_FILE=""
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --known-good)
+            KNOWN_GOOD_FILE="$2"
+            shift 2
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: $0 [--known-good <path>]"
+            exit 1
+            ;;
+    esac
+done
+
 mkdir -p "${LOG_DIR}" || true
 
+# Function to extract commit hash from known_good.json
+get_commit_hash() {
+    local module_name=$1
+    local known_good_file=$2
+    
+    if [[ -z "${known_good_file}" ]] || [[ ! -f "${known_good_file}" ]]; then
+        echo "N/A"
+        return
+    fi
+    
+    # Get the script directory
+    local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    
+    # Use the Python script to extract module info
+    python3 "${script_dir}/tools/get_module_info.py" "${known_good_file}" "${module_name}" "hash" 2>/dev/null || echo "N/A"
+}
+
+# Function to extract repo URL from known_good.json
+get_module_repo() {
+    local module_name=$1
+    local known_good_file=$2
+    
+    if [[ -z "${known_good_file}" ]] || [[ ! -f "${known_good_file}" ]]; then
+        echo "N/A"
+        return
+    fi
+    
+    # Get the script directory
+    local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    
+    # Use the Python script to extract module repo
+    python3 "${script_dir}/tools/get_module_info.py" "${known_good_file}" "${module_name}" "repo" 2>/dev/null || echo "N/A"
+}
+
 declare -A BUILD_TARGET_GROUPS=(
-    [baselibs]="@score_baselibs//score/..."
+    [score_baselibs]="@score_baselibs//score/..."
     [communication]="@communication//score/mw/com:com"
-    [persistency]="@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
+    [score_persistency]="@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
     #[score_logging]="@score_logging//src/..."
     [score_orchestrator]="@score_orchestrator//src/..."
     [score_test_scenarios]="@score_test_scenarios//..."
@@ -35,13 +89,16 @@ timestamp() { date '+%Y-%m-%d %H:%M:%S'; }
 
 echo "=== Integration Build Started $(timestamp) ===" | tee "${SUMMARY_FILE}"
 echo "Config: ${CONFIG}" | tee -a "${SUMMARY_FILE}"
+if [[ -n "${KNOWN_GOOD_FILE}" ]]; then
+    echo "Known Good File: ${KNOWN_GOOD_FILE}" | tee -a "${SUMMARY_FILE}"
+fi
 echo "" >> "${SUMMARY_FILE}"
 echo "## Build Groups Summary" >> "${SUMMARY_FILE}"
 echo "" >> "${SUMMARY_FILE}"
 # Markdown table header
 {
-    echo "| Group | Status | Duration (s) | Warnings | Deprecated refs |";
-    echo "|-------|--------|--------------|----------|-----------------|";
+    echo "| Group | Status | Duration (s) | Warnings | Deprecated refs | Commit/Version |";
+    echo "|-------|--------|--------------|----------|-----------------|----------------|";
 } >> "${SUMMARY_FILE}"
 
 overall_warn_total=0
@@ -50,6 +107,7 @@ overall_depr_total=0
 for group in "${!BUILD_TARGET_GROUPS[@]}"; do
     targets="${BUILD_TARGET_GROUPS[$group]}"
     log_file="${LOG_DIR}/${group}.log"
+    
     # Log build group banner only to stdout/stderr (not into summary table file)
     echo "--- Building group: ${group} ---"
     start_ts=$(date +%s)
@@ -73,16 +131,24 @@ for group in "${!BUILD_TARGET_GROUPS[@]}"; do
     else
         status_symbol="❌(${build_status})"
     fi
-    echo "| ${group} | ${status_symbol} | ${duration} | ${w_count} | ${d_count} |" | tee -a "${SUMMARY_FILE}"
+    
+    # Get commit hash/version for this group (group name is the module name)
+    commit_hash=$(get_commit_hash "${group}" "${KNOWN_GOOD_FILE}")
+    repo=$(get_module_repo "${group}" "${KNOWN_GOOD_FILE}")
+    
+    # Truncate commit hash for display (first 8 chars)
+    if [[ "${commit_hash}" != "N/A" ]] && [[ ${#commit_hash} -gt 8 ]]; then
+        commit_hash_display="${commit_hash:0:8}"
+    else
+        commit_hash_display="${commit_hash}"
+    fi
+    
+    echo "| ${group} | ${status_symbol} | ${duration} | ${w_count} | ${d_count} |  [${commit_hash_display}](${repo}/tree/${commit_hash}) |" | tee -a "${SUMMARY_FILE}"
 done
 
 # Append aggregate totals row to summary table
-echo "| TOTAL |  |  | ${overall_warn_total} | ${overall_depr_total} |" >> "${SUMMARY_FILE}"
-
-# Display the full build summary explicitly at the end
+echo "| TOTAL |  |  | ${overall_warn_total} | ${overall_depr_total} |  |" >> "${SUMMARY_FILE}"# Display the full build summary explicitly at the end
 echo '::group::Build Summary'
 echo '=== Build Summary (echo) ==='
 cat "${SUMMARY_FILE}" || echo "(Could not read summary file ${SUMMARY_FILE})"
-echo '::endgroup::'
-
-exit 0
+echo '::endgroup::'
diff --git a/known_good.json b/known_good.json
@@ -1,60 +1,50 @@
 {
     "timestamp": "2025-08-13T12:55:10Z",
-    "modules": [
-        {
-            "name": "score_baselibs",
+    "modules": {
+        "score_baselibs": {
             "version": "0.1.3",
             "repo": "https://github.com/eclipse-score/baselibs.git",
             "patches": [
                 "//:wait_free_stack_fix.patch"
             ]
         },
-        {
-            "name": "communication",
+        "communication": {
             "version": "0.1.1",
             "repo": "https://github.com/eclipse-score/communication.git"
         },
-        {
-            "name": "score_persistency",
+        "score_persistency": {
             "version": "0.2.1",
             "repo": "https://github.com/eclipse-score/persistency.git"
         },
-        {
-            "name": "score_orchestrator",
+        "score_orchestrator": {
             "version": "0.0.3",
             "repo": "https://github.com/eclipse-score/orchestrator.git"
         },
-        {
-            "name": "score_tooling",
+        "score_tooling": {
             "version": "1.0.2",
             "repo": "https://github.com/eclipse-score/tooling.git"
         },
-        {
-            "name": "score_platform",
+        "score_platform": {
             "hash": "a9cf44be1342f3c62111de2249eb3132f5ab88da",
             "repo": "https://github.com/eclipse-score/score.git"
         },
-        {
-            "name": "score_bazel_platforms",
+        "score_bazel_platforms": {
             "version": "0.0.2",
             "repo": "https://github.com/eclipse-score/bazel_platforms.git"
         },
-        {
-            "name": "score_test_scenarios",
+        "score_test_scenarios": {
             "version": "0.3.0",
             "repo": "https://github.com/eclipse-score/testing_tools.git"
         },
-        {
-            "name": "score_docs_as_code",
+        "score_docs_as_code": {
             "version": "2.0.1",
             "repo": "https://github.com/eclipse-score/docs-as-code.git"
         },
-        {
-            "name": "score_process",
+        "score_process": {
             "version": "1.3.1",
             "repo": "https://github.com/eclipse-score/process_description.git"
         }
-    ],
+    },
     "manifest_sha256": "4c9b7f...",
     "suite": "full",
     "duration_s": 742
diff --git a/known_good.updated.json b/known_good.updated.json
@@ -1,61 +1,51 @@
 {
-  "timestamp": "2025-11-13T08:26:11Z",
-  "modules": [
-    {
-      "name": "score_baselibs",
-      "repo": "https://github.com/eclipse-score/baselibs.git",
-      "hash": "edc4f8841c2210d11ef310049a78644ff3d039a3",
-      "patches": [
-        "//:wait_free_stack_fix.patch"
-      ]
-    },
-    {
-      "name": "communication",
-      "repo": "https://github.com/eclipse-score/communication.git",
-      "hash": "ff40e5f1e90ce406b71c664cc6c8e902ab465305"
-    },
-    {
-      "name": "score_persistency",
-      "repo": "https://github.com/eclipse-score/persistency.git",
-      "hash": "7548876ed3e40ec3f3053c57634de68129287e05"
-    },
-    {
-      "name": "score_orchestrator",
-      "repo": "https://github.com/eclipse-score/orchestrator.git",
-      "hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6"
-    },
-    {
-      "name": "score_tooling",
-      "repo": "https://github.com/eclipse-score/tooling.git",
-      "hash": "f36904e8c3d06c0ee761b14877ce7e5f6d3d9edb"
-    },
-    {
-      "name": "score_platform",
-      "repo": "https://github.com/eclipse-score/score.git",
-      "hash": "4277c625daca11ef1fe16ffe7670498b354baa72"
-    },
-    {
-      "name": "score_bazel_platforms",
-      "repo": "https://github.com/eclipse-score/bazel_platforms.git",
-      "hash": "0115193f958e8e592168df1e29cf86174bdba761"
-    },
-    {
-      "name": "score_test_scenarios",
-      "repo": "https://github.com/eclipse-score/testing_tools.git",
-      "hash": "a2f9cded3deb636f5dc800bf7a47131487119721"
-    },
-    {
-      "name": "score_docs_as_code",
-      "repo": "https://github.com/eclipse-score/docs-as-code.git",
-      "hash": "1067fb67782389b50827f8637a74b1027ece52ee"
-    },
-    {
-      "name": "score_process",
-      "repo": "https://github.com/eclipse-score/process_description.git",
-      "hash": "ea78e6d616adf1f13236c31479a31db813086a77"
-    }
-  ],
-  "manifest_sha256": "4c9b7f...",
-  "suite": "full",
-  "duration_s": 742
+    "timestamp": "2025-11-13T10:12:42Z",
+    "modules": {
+        "score_baselibs": {
+            "repo": "https://github.com/eclipse-score/baselibs.git",
+            "hash": "edc4f8841c2210d11ef310049a78644ff3d039a3",
+            "patches": [
+                "//:wait_free_stack_fix.patch"
+            ]
+        },
+        "communication": {
+            "repo": "https://github.com/eclipse-score/communication.git",
+            "hash": "ff40e5f1e90ce406b71c664cc6c8e902ab465305"
+        },
+        "score_persistency": {
+            "repo": "https://github.com/eclipse-score/persistency.git",
+            "hash": "7548876ed3e40ec3f3053c57634de68129287e05"
+        },
+        "score_orchestrator": {
+            "repo": "https://github.com/eclipse-score/orchestrator.git",
+            "hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6"
+        },
+        "score_tooling": {
+            "repo": "https://github.com/eclipse-score/tooling.git",
+            "hash": "654664dae7df2700fd5840c5ed6c07ac6c61705d"
+        },
+        "score_platform": {
+            "repo": "https://github.com/eclipse-score/score.git",
+            "hash": "4277c625daca11ef1fe16ffe7670498b354baa72"
+        },
+        "score_bazel_platforms": {
+            "repo": "https://github.com/eclipse-score/bazel_platforms.git",
+            "hash": "0115193f958e8e592168df1e29cf86174bdba761"
+        },
+        "score_test_scenarios": {
+            "repo": "https://github.com/eclipse-score/testing_tools.git",
+            "hash": "a2f9cded3deb636f5dc800bf7a47131487119721"
+        },
+        "score_docs_as_code": {
+            "repo": "https://github.com/eclipse-score/docs-as-code.git",
+            "hash": "1067fb67782389b50827f8637a74b1027ece52ee"
+        },
+        "score_process": {
+            "repo": "https://github.com/eclipse-score/process_description.git",
+            "hash": "e62e4c30808436e790590845f6c297cf605d7649"
+        }
+    },
+    "manifest_sha256": "4c9b7f...",
+    "suite": "full",
+    "duration_s": 742
 }
diff --git a/tools/get_module_info.py b/tools/get_module_info.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+"""Extract module information from known_good.json."""
+
+import json
+import sys
+
+
+def load_module_data(known_good_file, module_name):
+    """
+    Load module data from known_good.json.
+    
+    Args:
+        known_good_file: Path to the known_good.json file
+        module_name: Name of the module to look up
+        
+    Returns:
+        Dictionary with module data, or empty dict if not found
+    """
+    try:
+        with open(known_good_file, 'r') as f:
+            data = json.load(f)
+        modules = data.get('modules', {})
+        return modules.get(module_name, {})
+    except Exception:
+        return {}
+
+
+def get_module_field(module_data, field='hash'):
+    """
+    Extract a specific field from module data.
+    
+    Args:
+        module_data: Dictionary with module information
+        field: Field to extract ('hash', 'version', 'repo', or 'all')
+        
+    Returns:
+        Requested field value, or 'N/A' if not found
+        For 'hash': truncated to 8 chars if longer
+        For 'all': returns hash/version (prefers hash, falls back to version)
+    """
+    if not module_data:
+        return 'N/A'
+    
+    if field == 'repo':
+        repo = module_data.get('repo', 'N/A')
+        # Remove .git suffix if present
+        if repo.endswith('.git'):
+            repo = repo[:-4]
+        return repo
+    elif field == 'version':
+        return module_data.get('version', 'N/A')
+    elif field == 'hash':
+        hash_val = module_data.get('hash', 'N/A')
+        return hash_val
+    else:  # field == 'all' or default
+        hash_val = module_data.get('hash', module_data.get('version', 'N/A'))
+        return hash_val
+
+
+if __name__ == '__main__':
+    if len(sys.argv) < 3 or len(sys.argv) > 4:
+        print('Usage: get_module_info.py <known_good.json> <module_name> [field]')
+        print('  field: hash (default), version, repo, or all')
+        print('N/A')
+        sys.exit(1)
+    
+    known_good_file = sys.argv[1]
+    module_name = sys.argv[2]
+    field = sys.argv[3] if len(sys.argv) == 4 else 'all'
+    
+    module_data = load_module_data(known_good_file, module_name)
+    result = get_module_field(module_data, field)
+    print(result)
diff --git a/tools/update_module_from_known_good.py b/tools/update_module_from_known_good.py
diff --git a/tools/update_module_latest.py b/tools/update_module_latest.py
