Fix CI: Support legacy env script in binary swap test execution

Author: tuhaihe

.github/workflows/binary-swap-check.yml

@@ -524,39 +524,34 @@ jobs:
           echo "Installing baseline RPM: ${BASELINE_RPM}"
           # Use dnf to auto-resolve dependencies (like libssh)
           dnf install -y "${BASELINE_RPM}"
-          
-          # Move to expected location if prefix not respected by dnf (dnf doesn't easily support relocatable installs with dependencies?)
-          # Actually, Cloudberry RPMs are usually not relocatable? 
-          # Wait, check if the RPM was built as relocatable. The spec file defines Prefix: /usr/local/cloudberry-db
-          # rpm -ivh --prefix works. dnf install --setopt=install_weak_deps=False ... usually installs to default location.
-          # The previous error was about dependencies.
-          # If we use dnf, we might install to /usr/local/cloudberry-db-2.0.0...
-          # We need to ensure we can find it.
-          
-          # Let's try dnf install first.
-          
-          # Since we cannot easily use --prefix with dnf/yum for local files with dependencies, 
-          # we will let it install to its default location (likely /usr/local/cloudberry-db-VERSION)
-          # and then symlink or move if necessary.
-          
-          # BUT, we need strict paths for the test script. 
-          # The spec file installs to /usr/local/cloudberry-db-%{version} and symlinks /usr/local/cloudberry-db
-          
-          # To support the binary swap, we need "BASELINE_INSTALL_DIR" to point to where it actually installed.
-          # Let's see where it goes.
-          
-          # Check installed location
-          INSTALLED_DIR=$(rpm -ql apache-cloudberry-db-incubating | { head -1; cat >/dev/null; } | cut -d/ -f1-4)
-          echo "Installed to: ${INSTALLED_DIR}"
-          
-          # If we need it at BASELINE_INSTALL_DIR (/usr/local/cloudberry-db-baseline), we can move it or symlink.
-          if [ "${INSTALLED_DIR}" != "${BASELINE_INSTALL_DIR}" ]; then
-             echo "Relocating to ${BASELINE_INSTALL_DIR}..."
-             mv "${INSTALLED_DIR}" "${BASELINE_INSTALL_DIR}"
+
+          # Check installed location based on where bin/postgres ended up
+          INSTALLED_PG=$(rpm -ql apache-cloudberry-db-incubating | grep "bin/postgres$" | head -1)
+          if [ -z "$INSTALLED_PG" ]; then
+             echo "::error::Could not find bin/postgres in installed RPM"
+             exit 1
           fi
           
+          # Get the installation root (parent of bin)
+          INSTALLED_DIR=$(dirname $(dirname "$INSTALLED_PG"))
+          echo "Detected installation at: ${INSTALLED_DIR}"
+          
+          # Prepare target directory
+          # If target doesn't exist, we can just move.
+          if [ ! -d "${BASELINE_INSTALL_DIR}" ]; then
+              echo "Moving ${INSTALLED_DIR} to ${BASELINE_INSTALL_DIR}..."
+              mv "${INSTALLED_DIR}" "${BASELINE_INSTALL_DIR}"
+          elif [ "${INSTALLED_DIR}" != "${BASELINE_INSTALL_DIR}" ]; then
+              # If target exists (maybe empty dir created previously?), remove it and move
+              echo "Target ${BASELINE_INSTALL_DIR} exists, cleaning up..."
+              rm -rf "${BASELINE_INSTALL_DIR}"
+              mv "${INSTALLED_DIR}" "${BASELINE_INSTALL_DIR}"
+          else
+              echo "Already installed at target location."
+          fi
+
           chown -R gpadmin:gpadmin "${BASELINE_INSTALL_DIR}"
-          
+
           # Verify Installation
           echo "Verifying Baseline Installation..."
           rpm -qi apache-cloudberry-db-incubating
@@ -571,39 +566,10 @@ jobs:
           set -eo pipefail
           CURRENT_RPM=$(ls "${GITHUB_WORKSPACE}"/current_rpm/*.rpm | head -1)
           echo "Installing current RPM: ${CURRENT_RPM}"
-          
-          # If previous RPM is installed (same package name), dnf might complain or upgrade.
-          # We probably need to force install or rely on them being different versions?
-          # Actually, if the package name 'apache-cloudberry-db-incubating' is the same, dnf verifies.
-          # This is "Binary Swap", so we actully want them side-by-side.
-          # But RPM usually doesn't allow same package name side-by-side unless kernel.
-          
-          # WORKAROUND: Extract RPM content manually if dependency install is too tricky with conflicts?
-          # NO, the user wants "Robust".
-          
-          # Since we are installing "Baseline" then "Current", and they likely share the package name, 
-          # standard RPM DB won't like it.
-          # However, previously we used rpm -ivh --prefix.
-          
-          # STRATEGY: 
-          # 1. Install dependencies first using dnf (dummy check or explicitly install missing ones).
-          # 2. Then use rpm -ivh --prefix --nodeps (since we installed deps).
-          
-          # Let's try finding dependencies and installing them.
-          echo "Installing dependencies for ${CURRENT_RPM}..."
-          dnf -y install libssh perl apr bzip2 iproute rsync xz || true
-          
-          # Install using rpm with --prefix and --nodeps (assuming we got deps)
-          # OR just rely on rpm -ivh --prefix forcing it? No, that failed deps.
-          
-          # BETTER STRATEGY: dnf install dependencies explicitly.
-          # libssh is missing.
-          dnf install -y libssh
-          
-          # Revert to rpm -ivh --prefix but now dependencies are satisfied.
+
           rpm -ivh "${CURRENT_RPM}" --prefix="${CURRENT_INSTALL_DIR}"
           chown -R gpadmin:gpadmin "${CURRENT_INSTALL_DIR}"
-          
+ 
           # Verify Installation
           echo "Verifying Current Installation..."
           if [ ! -f "${CURRENT_INSTALL_DIR}/bin/postgres" ]; then
@@ -636,7 +602,11 @@ jobs:
           
           ln -sfn "${BASELINE_INSTALL_DIR}" "${CBDB_INSTALL_DIR}"
           su - gpadmin -c "
-            source ${CBDB_INSTALL_DIR}/cloudberry-env.sh
+            if [ -f ${CBDB_INSTALL_DIR}/cloudberry-env.sh ]; then
+              source ${CBDB_INSTALL_DIR}/cloudberry-env.sh
+            else
+              source ${CBDB_INSTALL_DIR}/greenplum_path.sh
+            fi
             cd ${GITHUB_WORKSPACE}/gpAux/gpdemo
             make cluster
             gpstop -a