ci: remove workdir from upload artifacts. simplify logs structure

Author: AndriiFilippov

.github/workflows/ci.yml

@@ -131,6 +131,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: eclipse-update-site-test-results
-          path: |
-            releng/update-site-tests/out
-            releng/update-site-tests/workdir
+          path: releng/update-site-tests/out

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

@@ -21,15 +21,18 @@ WORKDIR="$WORKROOT/$CASE_ID"
 
 mkdir -p "$LOGDIR" "$WORKDIR"
 
+RUNLOG="$LOGDIR/run.log"
+exec > >(tee -a "$RUNLOG") 2>&1
+
 echo "=== [$CASE_ID] Starting case ==="
-echo "Base product: $BASE_PRODUCT" | tee "$LOGDIR/case-info.log"
+echo "Base product: $BASE_PRODUCT"
 
 # Build the base installation into "$WORKDIR/eclipse"
 ECLIPSE_HOME="$WORKDIR/eclipse"
 
 if [[ "$BASE_PRODUCT" == "eclipse-cdt" ]]; then
   : "${ECLIPSE_URL:?ECLIPSE_URL required for eclipse-cdt}"
-  echo "Downloading Eclipse from: $ECLIPSE_URL" | tee "$LOGDIR/eclipse-download.log"
+  echo "Downloading Eclipse from: $ECLIPSE_URL"
   curl -fsSL "$ECLIPSE_URL" -o "$WORKDIR/eclipse.tar.gz"
   tar -xzf "$WORKDIR/eclipse.tar.gz" -C "$WORKDIR"
 
@@ -43,15 +46,15 @@ if [[ "$BASE_PRODUCT" == "eclipse-cdt" ]]; then
 
 elif [[ "$BASE_PRODUCT" == "espressif-ide" ]]; then
   : "${ESPRESSIF_IDE_SOURCE:?ESPRESSIF_IDE_SOURCE not set (path to preinstalled IDE or extracted IDE root)}"
-echo "Copying Espressif-IDE from: $ESPRESSIF_IDE_SOURCE" | tee "$LOGDIR/ide-copy.log"
-mkdir -p "$ECLIPSE_HOME"
-cp -a "$ESPRESSIF_IDE_SOURCE"/. "$ECLIPSE_HOME"/
+  echo "Copying Espressif-IDE from: $ESPRESSIF_IDE_SOURCE"
+  mkdir -p "$ECLIPSE_HOME"
+  cp -a "$ESPRESSIF_IDE_SOURCE"/. "$ECLIPSE_HOME"/
 else
   echo "Unknown BASE_PRODUCT: $BASE_PRODUCT"
   exit 1
 fi
 
-echo "ECLIPSE_HOME=$ECLIPSE_HOME" | tee "$LOGDIR/eclipse-home.log"
+echo "ECLIPSE_HOME=$ECLIPSE_HOME"
 
 if [[ -x "$ECLIPSE_HOME/eclipse" ]]; then
   LAUNCHER="$ECLIPSE_HOME/eclipse"
@@ -62,7 +65,7 @@ else
   ls -la "$ECLIPSE_HOME" || true
   exit 1
 fi
-echo "Using launcher: $LAUNCHER" | tee "$LOGDIR/launcher.log"
+echo "Using launcher: $LAUNCHER"
 
 # Common director flags: IMPORTANT to keep same destination/profile/bundlepool across steps
 P2_DEST_ARGS=( -destination "$ECLIPSE_HOME" -profile SDKProfile -bundlepool "$WORKDIR/p2" -roaming )
@@ -79,29 +82,25 @@ build_repo_list() {
 
 install_iu () {
   local repo="$1"
-  local log="$2"
   "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -repository "$repo" \
     -installIU "$FEATURE_ID" \
     "${P2_DEST_ARGS[@]}" \
-    -consoleLog \
-    | tee "$LOGDIR/$log"
+    -consoleLog
 }
 
 replace_iu () {
   local repo="$1"
-  local log="$2"
   "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -repository "$repo" \
     -uninstallIU "$FEATURE_ID" \
     -installIU "$FEATURE_ID" \
     "${P2_DEST_ARGS[@]}" \
-    -consoleLog \
-    | tee "$LOGDIR/$log"
+    -consoleLog
 }
 
 list_ius () {
@@ -112,7 +111,7 @@ list_ius () {
     -listInstalledIUs \
     "${P2_DEST_ARGS[@]}" \
     -consoleLog \
-    | tee "$LOGDIR/$out"
+    > "$LOGDIR/$out" 2>&1 || true
 }
 
 list_roots () {
@@ -123,35 +122,39 @@ list_roots () {
     -listInstalledRoots \
     "${P2_DEST_ARGS[@]}" \
     -consoleLog \
-    | tee "$LOGDIR/$out"
+    > "$LOGDIR/$out" 2>&1 || true
 }
 
 # --- Step A: install stable ---
 if [[ "${SKIP_STABLE_INSTALL:-0}" != "1" ]]; then
-  echo "Installing STABLE from $IEP_STABLE_REPO" | tee "$LOGDIR/stepA.log"
-  install_iu "$(build_repo_list "$IEP_STABLE_REPO" "${ECLIPSE_P2_REPO:-}")" "stable-install.log"
+  echo "Installing STABLE from $IEP_STABLE_REPO"
+  install_iu "$(build_repo_list "$IEP_STABLE_REPO" "${ECLIPSE_P2_REPO:-}")"
 else
-  echo "Skipping STABLE install (SKIP_STABLE_INSTALL=1)" | tee "$LOGDIR/stepA.log"
+  echo "Skipping STABLE install (SKIP_STABLE_INSTALL=1)"
 fi
 
 # --- Step B: optional update to dev/nightly ---
 if [[ "${DO_DEV_UPDATE:-0}" == "1" ]]; then
-  echo "Updating to DEV/NIGHTLY from $IEP_DEV_REPO" | tee "$LOGDIR/stepB.log"
-  replace_iu "$(build_repo_list "$IEP_DEV_REPO" "${ECLIPSE_P2_REPO:-}")" "dev-update.log"
+  echo "Updating to DEV/NIGHTLY from $IEP_DEV_REPO"
+  replace_iu "$(build_repo_list "$IEP_DEV_REPO" "${ECLIPSE_P2_REPO:-}")"
 fi
 
-# Diagnostics
-list_ius "installed-ius.txt" || true
-list_roots "installed-roots.txt" || true
+# Diagnostics (kept as small separate files)
+list_ius "installed-ius.txt"
+list_roots "installed-roots.txt"
 
-# Extract versions from logs (best-effort)
-STABLE_VER="$(grep -Eo "Installing $FEATURE_ID [^[:space:]]+" "$LOGDIR/stable-install.log" | awk '{print $3}' | tail -n1 || true)"
-DEV_VER="$(grep -Eo "Installing $FEATURE_ID [^[:space:]]+" "$LOGDIR/dev-update.log" | awk '{print $3}' | tail -n1 || true)"
-REMOVED_VER="$(grep -Eo "Uninstalling $FEATURE_ID [^[:space:]]+" "$LOGDIR/dev-update.log" | awk '{print $3}' | tail -n1 || true)"
+# 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 (store excerpt)
+# Conflict scan (from combined log)
 ERROR_PATTERNS='conflict|cannot complete|missing requirement|Only one of the following can be installed'
-grep -Ein "$ERROR_PATTERNS" "$LOGDIR"/*.log > "$LOGDIR/conflicts.txt" || true
+if grep -Ein "$ERROR_PATTERNS" "$RUNLOG" >/dev/null 2>&1; then
+  HAS_CONFLICTS=1
+else
+  HAS_CONFLICTS=0
+fi
 
 # Report
 {
@@ -173,9 +176,9 @@ grep -Ein "$ERROR_PATTERNS" "$LOGDIR"/*.log > "$LOGDIR/conflicts.txt" || true
     echo "  Dev replaced:     ${REMOVED_VER:-<unknown>}"
   fi
   echo ""
-  echo "Conflicts (grep excerpt):"
-  if [[ -s "$LOGDIR/conflicts.txt" ]]; then
-    cat "$LOGDIR/conflicts.txt"
+  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