From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 12 Mar 2025 20:37:19 +0000 (-0400)
Subject: ceph-pull-requests: convert job to run make check in a container
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3eb57a9ab9ba8b7b0f01fd19ba131516b7083182;p=ceph-build.git

ceph-pull-requests: convert job to run make check in a container

Convert the test script to run make check using the
build-with-container.py tool. Converts env vars that were directly
passed to the script to use a env file.
Updates the timeout to 4hour (to match the arm64 job) and avoid timeouts.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/ceph-pull-requests/build/build b/ceph-pull-requests/build/build
index edb3ebb0..92f18bd8 100644
--- a/ceph-pull-requests/build/build
+++ b/ceph-pull-requests/build/build
@@ -9,9 +9,48 @@ if [[ "$DOCS_ONLY" = true || "$CONTAINER_ONLY" = true || "$GHA_ONLY" == true ||
     exit 0
 fi
 
-export NPROC=$(nproc)
-export WITH_CRIMSON=true
-export WITH_RBD_RWL=true
-timeout 3h ./run-make-check.sh
+NPROC=$(nproc)
+NPMCACHE=${HOME}/npmcache
+cat >.env <<EOF
+NPROC=${NPROC}
+MAX_PARALLEL_JOBS=${NPROC}
+WITH_CRIMSON=true
+WITH_RBD_RWL=true
+JENKINS_HOME=${JENKINS_HOME}
+REWRITE_COVERAGE_ROOTDIR=${PWD}/src/pybind/mgr/dashboard/frontend
+EOF
+# TODO: enable (read-only?) sccache support
+npm_cache_info() {
+    echo '===== npm cache info ======='
+    du -sh "${NPMCACHE}" || echo "${NPMCACHE} not present"
+    echo '============================'
+}
+bwc() {
+    # specify timeout in hours for $1
+    local timeout=$(($1*60*60))
+    shift
+    ./src/script/build-with-container.py \
+        -d "${DISTRO_BASE:-jammy}" \
+        --env-file="${PWD}/.env" \
+        --current-branch="${GIT_BRANCH:-main}" \
+        -t+amd64 \
+        --npm-cache-path="${NPMCACHE}" \
+        -x"--timeout=${timeout}" \
+        "${@}"
+}
+
+npm_cache_info
+bwc 1 -e configure
+# try to pre-load the npm cache so that it doesn't fail during the normal build
+# step
+for i in {0..5}; do
+    bwc 1 -e custom -- \
+        cmake --build build -t mgr-dashboard-frontend-deps && break
+    echo "Warning: Attempt $((i+1)) to cache npm packages failed."
+    sleep $((10 + 30 * i))
+done
+npm_cache_info
+bwc 4 -e tests
+npm_cache_info
 sleep 5
 ps -ef | grep -v jnlp | grep ceph || true