ci: simplified report structure

Author: AndriiFilippov

releng/update-site-tests/run-single-case.sh

@@ -16,7 +16,6 @@ OUTROOT="${OUTROOT:-$ROOT_DIR/out}"
 
 CASE_DIR="$OUTROOT/$CASE_ID"
 LOGDIR="$CASE_DIR/logs"
-REPORT="$CASE_DIR/report.txt"
 WORKDIR="$WORKROOT/$CASE_ID"
 
 mkdir -p "$LOGDIR" "$WORKDIR"
@@ -108,7 +107,7 @@ list_ius () {
   "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
-    -listInstalledIUs \
+    -list \
     "${P2_DEST_ARGS[@]}" \
     -consoleLog \
     > "$LOGDIR/$out" 2>&1 || true
@@ -143,11 +142,6 @@ fi
 list_ius "installed-ius.txt"
 list_roots "installed-roots.txt"
 
-# Extract versions from combined log (best-effort)
-STABLE_VER="$(grep -Eo "Installing $FEATURE_ID [^[:space:]]+" "$RUNLOG" | awk '{print $3}' | tail -n1 || true)"
-DEV_VER="$(grep -Eo "Installing $FEATURE_ID [^[:space:]]+" "$RUNLOG" | awk '{print $3}' | tail -n1 || true)"
-REMOVED_VER="$(grep -Eo "Uninstalling $FEATURE_ID [^[:space:]]+" "$RUNLOG" | awk '{print $3}' | tail -n1 || true)"
-
 # Conflict scan (from combined log)
 ERROR_PATTERNS='conflict|cannot complete|missing requirement|Only one of the following can be installed'
 if grep -Ein "$ERROR_PATTERNS" "$RUNLOG" >/dev/null 2>&1; then
@@ -156,38 +150,31 @@ else
   HAS_CONFLICTS=0
 fi
 
-# Report
-{
-  echo "ESP Eclipse Plug-in Update Path Report"
-  echo "====================================="
-  echo ""
-  echo "Case: $CASE_ID"
-  echo "Base product: $BASE_PRODUCT"
-  [[ -n "${ECLIPSE_P2_REPO:-}" ]] && echo "Eclipse P2 repo: $ECLIPSE_P2_REPO"
-  [[ -n "${ECLIPSE_URL:-}" ]] && echo "Eclipse URL: $ECLIPSE_URL"
-  echo ""
-  echo "IEP stable repo:  $IEP_STABLE_REPO"
-  echo "IEP dev repo:     $IEP_DEV_REPO"
-  echo ""
-  echo "Versions (best-effort from logs):"
-  echo "  Stable installed: ${STABLE_VER:-<unknown>}"
-  if [[ "${DO_DEV_UPDATE:-0}" == "1" ]]; then
-    echo "  Dev installed:    ${DEV_VER:-<unknown>}"
-    echo "  Dev replaced:     ${REMOVED_VER:-<unknown>}"
-  fi
+# Summary
+echo ""
+echo "ESP Eclipse Plug-in Update Path Summary"
+echo "======================================="
+echo ""
+echo "Case: $CASE_ID"
+echo "Base product: $BASE_PRODUCT"
+[[ -n "${ECLIPSE_P2_REPO:-}" ]] && echo "Eclipse P2 repo: $ECLIPSE_P2_REPO"
+[[ -n "${ECLIPSE_URL:-}" ]] && echo "Eclipse URL: $ECLIPSE_URL"
+echo ""
+echo "IEP stable repo:  $IEP_STABLE_REPO"
+echo "IEP dev repo:     $IEP_DEV_REPO"
+echo ""
+
+ERROR_PATTERNS='conflict|cannot complete|missing requirement|Only one of the following can be installed'
+if grep -Ein "$ERROR_PATTERNS" "$RUNLOG" >/dev/null 2>&1; then
+  echo "Conflicts (grep scan in logs/run.log):"
+  echo "Found (see above in run.log)"
   echo ""
+  echo "STATUS: FAILED"
+  exit 2
+else
   echo "Conflicts (grep scan in logs/run.log):"
-  if [[ "$HAS_CONFLICTS" == "1" ]]; then
-    echo "Found (see logs/run.log)"
-    echo ""
-    echo "STATUS: FAILED (conflict patterns detected)"
-    exit_code=2
-  else
-    echo "None"
-    echo ""
-    echo "STATUS: PASSED"
-    exit_code=0
-  fi
-} > "$REPORT"
-
-exit "${exit_code:-0}"
+  echo "None"
+  echo ""
+  echo "STATUS: PASSED"
+  exit 0
+fi