ci: removed uninstallIU step for IDE case 4

AndriiFilippov · AndriiFilippov · commit 99be95654d4e · 2026-03-05T09:50:09.000+01:00
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -1,60 +1,60 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven on Windows 
-
-on:
-  push:
-    branches:
-     - master
-     - release/**
-  pull_request:
-    branches:
-     - master
-     - release/**
-
-jobs:
-  build_windows:
-
-    runs-on:
-      - eclipseUpd
-      - BrnoWIN0007
+# # This workflow will build a Java project with Maven
+# # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+# name: Java CI with Maven on Windows 
+
+# on:
+#   push:
+#     branches:
+#      - master
+#      - release/**
+#   pull_request:
+#     branches:
+#      - master
+#      - release/**
+
+# jobs:
+#   build_windows:
+
+#     runs-on:
+#       - eclipseUpd
+#       - BrnoWIN0007
     
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Clone IDF Release From Github
-      uses: actions/checkout@v4
-      with:
-        repository: espressif/esp-idf
-        path: dependencies/idf-tools
-        submodules: 'true'
-        ref: release/v5.1
-
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-          python-version: '3.11'
-
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@v5
-      with:
-        maven-version: 3.9.6
+#     steps:
+#     - uses: actions/checkout@v4
+
+#     - name: Clone IDF Release From Github
+#       uses: actions/checkout@v4
+#       with:
+#         repository: espressif/esp-idf
+#         path: dependencies/idf-tools
+#         submodules: 'true'
+#         ref: release/v5.1
+
+#     - name: Set up Python
+#       uses: actions/setup-python@v4
+#       with:
+#           python-version: '3.11'
+
+#     - name: Set up Maven
+#       uses: stCarolas/setup-maven@v5
+#       with:
+#         maven-version: 3.9.6
    
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-
-    - name: Build with Maven
-      run: mvn clean verify "-Djarsigner.skip=true" "-DskipTests=false" "-DtestWorkspace=C:/actions-runner/_work/workspace"
-
-    - name: Publish Test Reports
-      if: ${{ always() }}
-      uses: phoenix-actions/test-reporting@v12
-      with:
-        name: Windows Test Reports
-        path:
-          tests/*/*/*/TEST-*.xml
-        reporter: java-junit
+#     - name: Set up JDK 21
+#       uses: actions/setup-java@v4
+#       with:
+#         java-version: '21'
+#         distribution: 'temurin'
+
+#     - name: Build with Maven
+#       run: mvn clean verify "-Djarsigner.skip=true" "-DskipTests=false" "-DtestWorkspace=C:/actions-runner/_work/workspace"
+
+#     - name: Publish Test Reports
+#       if: ${{ always() }}
+#       uses: phoenix-actions/test-reporting@v12
+#       with:
+#         name: Windows Test Reports
+#         path:
+#           tests/*/*/*/TEST-*.xml
+#         reporter: java-junit
diff --git a/releng/update-site-tests/run-all-cases.sh b/releng/update-site-tests/run-all-cases.sh
@@ -20,34 +20,60 @@ source "$ROOT_DIR/detect-latest-eclipse-steams.sh"
 FAIL=0
 
 echo "=== Case 1: Plain Eclipse (latest R) + stable IEP install ==="
-CASE_ID="case1-eclipseR-stable" \
-BASE_PRODUCT="eclipse-cdt" \
-ECLIPSE_URL="$ECLIPSE_R_URL" \
-ECLIPSE_P2_REPO="$ECLIPSE_R_P2" \
-DO_DEV_UPDATE=0 \
-WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
-bash "$ROOT_DIR/run-single-case.sh" || FAIL=1
+
+if CASE_ID="case1-eclipseR-stable" \
+   BASE_PRODUCT="eclipse-cdt" \
+   ECLIPSE_URL="$ECLIPSE_R_URL" \
+   ECLIPSE_P2_REPO="$ECLIPSE_R_P2" \
+   DO_DEV_UPDATE=0 \
+   WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
+   bash "$ROOT_DIR/run-single-case.sh"; then
+
+  echo "✅ Test Case 1 completed successfully"
+
+else
+  echo "❌ Test Case 1 FAILED"
+  FAIL=1
+fi
 
 echo "=== Case 2: Plain Eclipse (latest R) stable -> dev update ==="
-CASE_ID="case2-eclipseR-stable-to-dev" \
-BASE_PRODUCT="eclipse-cdt" \
-ECLIPSE_URL="$ECLIPSE_R_URL" \
-ECLIPSE_P2_REPO="$ECLIPSE_R_P2" \
-DO_DEV_UPDATE=1 \
-WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
-bash "$ROOT_DIR/run-single-case.sh" || FAIL=1
+
+if CASE_ID="case2-eclipseR-stable-to-dev" \
+   BASE_PRODUCT="eclipse-cdt" \
+   ECLIPSE_URL="$ECLIPSE_R_URL" \
+   ECLIPSE_P2_REPO="$ECLIPSE_R_P2" \
+   DO_DEV_UPDATE=1 \
+   WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
+   bash "$ROOT_DIR/run-single-case.sh"; then
+
+  echo "✅ Test Case 2 completed successfully"
+
+else
+  echo "❌ Test Case 2 FAILED"
+  FAIL=1
+fi
 
 echo "=== Case 3: Plain Eclipse (latest milestone) stable -> dev update ==="
+
 if [[ -n "${ECLIPSE_M_RELEASE:-}" && -n "${ECLIPSE_M_URL:-}" && -n "${ECLIPSE_M_P2:-}" ]]; then
-  CASE_ID="case3-eclipseM-stable-to-dev" \
-  BASE_PRODUCT="eclipse-cdt" \
-  ECLIPSE_URL="$ECLIPSE_M_URL" \
-  ECLIPSE_P2_REPO="$ECLIPSE_M_P2" \
-  DO_DEV_UPDATE=1 \
-  WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
-  bash "$ROOT_DIR/run-single-case.sh" || FAIL=1
+
+  if CASE_ID="case3-eclipseM-stable-to-dev" \
+     BASE_PRODUCT="eclipse-cdt" \
+     ECLIPSE_URL="$ECLIPSE_M_URL" \
+     ECLIPSE_P2_REPO="$ECLIPSE_M_P2" \
+     DO_DEV_UPDATE=1 \
+     WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
+     bash "$ROOT_DIR/run-single-case.sh"; then
+
+      echo "✅ Test Case 3 completed successfully"
+
+  else
+      echo "❌ Test Case 3 FAILED"
+      FAIL=1
+  fi
+
 else
-  echo "Skipping Case 3 (no milestone detected)."
+  echo "⚠️ Skipping Case 3 (no milestone detected)."
 fi
 
 echo "=== Preparing Espressif-IDE (latest stable) for Case 4 ==="
@@ -85,12 +111,21 @@ test -x "$ESPRESSIF_IDE_SOURCE/espressif-ide" || { echo "❌ Invalid ESPRESSIF_I
 
 echo "=== Case 4: Espressif-IDE stable -> dev update ==="
 : "${ESPRESSIF_IDE_SOURCE:?Provide ESPRESSIF_IDE_SOURCE for Case 4 (path to extracted IDE root)}"
-CASE_ID="case4-espressif-ide-stable-to-dev" \
-BASE_PRODUCT="espressif-ide" \
-DO_DEV_UPDATE=1 \
-ESPRESSIF_IDE_SOURCE="$ESPRESSIF_IDE_SOURCE" \
-WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
-bash "$ROOT_DIR/run-single-case.sh" || FAIL=1
+
+if CASE_ID="case4-espressif-ide-bundled-to-nightly" \
+   BASE_PRODUCT="espressif-ide" \
+   DO_DEV_UPDATE=1 \
+   SKIP_STABLE_INSTALL=1 \
+   ESPRESSIF_IDE_SOURCE="$ESPRESSIF_IDE_SOURCE" \
+   WORKROOT="$WORKROOT" OUTROOT="$OUTROOT" \
+   bash "$ROOT_DIR/run-single-case.sh"; then
+
+  echo "✅ Test Case 4 completed successfully"
+
+else
+  echo "❌ Test Case 4 FAILED"
+  FAIL=1
+fi
 
 echo ""
 echo "All cases finished. Artifacts in: $OUTROOT"
diff --git a/releng/update-site-tests/run-single-case.sh b/releng/update-site-tests/run-single-case.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CASE_ID="${CASE_ID:?CASE_ID not set}"
-BASE_PRODUCT="${BASE_PRODUCT:?BASE_PRODUCT not set}"   # "eclipse-cdt" or "espressif-ide"
+BASE_PRODUCT="${BASE_PRODUCT:?BASE_PRODUCT not set}"
 ECLIPSE_URL="${ECLIPSE_URL:-}"
 ECLIPSE_P2_REPO="${ECLIPSE_P2_REPO:-}"
 
@@ -33,7 +33,6 @@ if [[ "$BASE_PRODUCT" == "eclipse-cdt" ]]; then
   curl -fsSL "$ECLIPSE_URL" -o "$WORKDIR/eclipse.tar.gz"
   tar -xzf "$WORKDIR/eclipse.tar.gz" -C "$WORKDIR"
 
-  ### UPDATED: more robust way to locate Eclipse home (prefer eclipse/eclipse, fallback to searching executable)
   if [[ -x "$WORKDIR/eclipse/eclipse" ]]; then
     ECLIPSE_HOME="$WORKDIR/eclipse"
   else
@@ -44,16 +43,16 @@ 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"
-  cp -a "$ESPRESSIF_IDE_SOURCE" "$ECLIPSE_HOME"
+echo "Copying Espressif-IDE from: $ESPRESSIF_IDE_SOURCE" | tee "$LOGDIR/ide-copy.log"
+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"
 
-### UPDATED: choose correct launcher for p2 director (plain Eclipse uses 'eclipse', Espressif-IDE uses 'espressif-ide')
 if [[ -x "$ECLIPSE_HOME/eclipse" ]]; then
   LAUNCHER="$ECLIPSE_HOME/eclipse"
 elif [[ -x "$ECLIPSE_HOME/espressif-ide" ]]; then
@@ -68,7 +67,6 @@ echo "Using launcher: $LAUNCHER" | tee "$LOGDIR/launcher.log"
 # Common director flags: IMPORTANT to keep same destination/profile/bundlepool across steps
 P2_DEST_ARGS=( -destination "$ECLIPSE_HOME" -profile SDKProfile -bundlepool "$WORKDIR/p2" -roaming )
 
-### UPDATED: helper to avoid trailing comma in -repository when ECLIPSE_P2_REPO is empty (e.g., Case 4)
 build_repo_list() {
   local primary="$1"
   local extra="${2:-}"
@@ -82,7 +80,7 @@ build_repo_list() {
 install_iu () {
   local repo="$1"
   local log="$2"
-  "$LAUNCHER" \  ### UPDATED: was "$ECLIPSE_HOME/eclipse"
+  "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -repository "$repo" \
@@ -95,7 +93,7 @@ install_iu () {
 replace_iu () {
   local repo="$1"
   local log="$2"
-  "$LAUNCHER" \  ### UPDATED: was "$ECLIPSE_HOME/eclipse"
+  "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -repository "$repo" \
@@ -108,7 +106,7 @@ replace_iu () {
 
 list_ius () {
   local out="$1"
-  "$LAUNCHER" \  ### UPDATED: was "$ECLIPSE_HOME/eclipse"
+  "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -listInstalledIUs \
@@ -119,7 +117,7 @@ list_ius () {
 
 list_roots () {
   local out="$1"
-  "$LAUNCHER" \  ### UPDATED: was "$ECLIPSE_HOME/eclipse"
+  "$LAUNCHER" \
     -nosplash \
     -application org.eclipse.equinox.p2.director \
     -listInstalledRoots \
@@ -129,14 +127,16 @@ list_roots () {
 }
 
 # --- Step A: install stable ---
-echo "Installing STABLE from $IEP_STABLE_REPO" | tee "$LOGDIR/stepA.log"
-### UPDATED: avoid trailing comma if ECLIPSE_P2_REPO is empty
-install_iu "$(build_repo_list "$IEP_STABLE_REPO" "${ECLIPSE_P2_REPO:-}")" "stable-install.log"
+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"
+else
+  echo "Skipping STABLE install (SKIP_STABLE_INSTALL=1)" | tee "$LOGDIR/stepA.log"
+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"
-  ### UPDATED: avoid trailing comma if ECLIPSE_P2_REPO is empty
   replace_iu "$(build_repo_list "$IEP_DEV_REPO" "${ECLIPSE_P2_REPO:-}")" "dev-update.log"
 fi
 
