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

ceph-pull-requests-arm64: 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.
Remove the redundant n_test_jobs variable since it is *always* the
same as n_build_jobs.

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

diff --git a/ceph-pull-requests-arm64/build/build b/ceph-pull-requests-arm64/build/build
index be8363b2..b816fcf0 100644
--- a/ceph-pull-requests-arm64/build/build
+++ b/ceph-pull-requests-arm64/build/build
@@ -10,11 +10,49 @@ if [[ "$DOCS_ONLY" = true || "$CONTAINER_ONLY" = true || "$GHA_ONLY" == true ||
 fi
 
 n_build_jobs=$(get_nr_build_jobs)
-n_test_jobs=${n_build_jobs}
-export CHECK_MAKEOPTS="-j${n_test_jobs}"
-export BUILD_MAKEOPTS="-j${n_build_jobs}"
-export WITH_CRIMSON=true
-export WITH_RBD_RWL=true
-timeout 4h ./run-make-check.sh
+NPMCACHE=${HOME}/npmcache
+cat >.env <<EOF
+CHECK_MAKEOPTS="-j${n_build_jobs}"
+BUILD_MAKEOPTS="-j${n_build_jobs}"
+NPROC=${n_build_jobs}
+MAX_PARALLEL_JOBS=${n_build_jobs}
+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+arm64 \
+        --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