diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 49946ce48840c4666f6a5bf4a3a726abb40a33bf..b50c89d407a025b30f68f6a6be5991cf1ba35b09 100755 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -36,6 +36,7 @@ pipeline { environment { DOCKER_BASE_IMAGE = "debian:bullseye" DEPENDENCY_PYTHON = "python@3.8.2" + YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack" YASHCHIKI_IMAGE_NAME = "singularity_visionary_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080" diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index 8b75e14341b7a75fe15e4c553165a399082ab305..d1f254377d1044e5b11e19c71bf7912142ec6239 100755 --- a/.ci/Jenkinsfile_asic +++ b/.ci/Jenkinsfile_asic @@ -38,6 +38,7 @@ pipeline { DOCKER_BASE_IMAGE = "centos:7" // versions from system packages DEPENDENCY_PYTHON = "python@3.8.3" + YASHCHIKI_SPACK_PATH = "${env.WORKSPACE}/spack" YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img" YASHCHIKI_SANDBOXES = "sandboxes" YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080" diff --git a/.ci/build_image.sh b/.ci/build_image.sh index 6da77f060e1040d2eca4bf2d6f8b7d29d8127125..45cffc6bd65731b46e00795a5bcdd3618244193d 100755 --- a/.ci/build_image.sh +++ b/.ci/build_image.sh @@ -12,7 +12,7 @@ TARGET_FOLDER="$(find ${YASHCHIKI_SANDBOXES} -mindepth 1 -maxdepth 1)" # We want the spack folder to be available inside the container image # -> it needs to be bind mounted to the sandbox folder -sudo mount --bind "${PWD}/spack" "${TARGET_FOLDER}/opt/spack" +sudo mount --bind "${YASHCHIKI_SPACK_PATH}" "${TARGET_FOLDER}/opt/spack" # TODO: singularity 3.1 produces SIF w/o setuid flags on files, using a newer # singularity for the image build diff --git a/.ci/dump_meta_info.sh b/.ci/dump_meta_info.sh index c41047d227addc42a1fa979e85469f19b6c8c908..04ee6e91df8d34680f16fdc02153f448c153eda3 100755 --- a/.ci/dump_meta_info.sh +++ b/.ci/dump_meta_info.sh @@ -21,7 +21,7 @@ mkdir -p "${META_DIR_OUTSIDE}" ) ( - cd "${WORKSPACE}/spack" + cd ${YASHCHIKI_SPACK_PATH} git log > "${META_DIR_OUTSIDE}/spack_git.log" if [ "${CONTAINER_BUILD_TYPE}" = "testing" ]; then gerrit_get_current_change_commits \ diff --git a/.ci/fetch.sh b/.ci/fetch.sh index 9da04e523f9184454529c988056da7192f9cad21..5e9c6ca5ff80857f81ad18fb8fa2c62046063d5b 100755 --- a/.ci/fetch.sh +++ b/.ci/fetch.sh @@ -9,15 +9,15 @@ source "${SOURCE_DIR}/commons.sh" # hard-link source cache into spack folder to avoid duplication. # https://github.com/spack/spack/pull/12940 introduced a new format for the # cache, so we switch from $HOME/download_cache to $HOME/source_cache -mkdir -p "${PWD}/spack/var/spack/cache/" +mkdir -p "${YASHCHIKI_SPACK_PATH}/var/spack/cache/" find "${SOURCE_CACHE_DIR}" -mindepth 1 -maxdepth 1 -print0 \ - | xargs -r -n 1 "-I{}" -0 cp -vrl '{}' "${PWD}/spack/var/spack/cache/" + | xargs -r -n 1 "-I{}" -0 cp -vrl '{}' "${YASHCHIKI_SPACK_PATH}/var/spack/cache/" # set download mirror stuff to prefill outside of container -export MY_SPACK_FOLDER="$PWD/spack" +export MY_SPACK_FOLDER="${YASHCHIKI_SPACK_PATH}" export MY_SPACK_BIN="${MY_SPACK_FOLDER}/bin/spack" -PATH_COMPILERS="${PWD}/spack/etc/spack/compilers.yaml" +PATH_COMPILERS="${MY_SPACK_FOLDER}/etc/spack/compilers.yaml" # Add fake system compiler (needed for fetching) # This is NOT the correct version but we need to concretize with the same @@ -165,7 +165,7 @@ else fi # update cache in any case to store successfully loaded files -rsync -av "${PWD}/spack/var/spack/cache/" "${SOURCE_CACHE_DIR}/" +rsync -av "${MY_SPACK_FOLDER}/var/spack/cache/" "${SOURCE_CACHE_DIR}/" if (( fetch_failed != 0 )); then # propagate error diff --git a/.ci/visionary_create_recipe.sh b/.ci/visionary_create_recipe.sh index f2f02936de330b46ebf54ea94e80e27d9f019ecc..9e7f6233919749c11ef8c61cd29cc2353168ba50 100755 --- a/.ci/visionary_create_recipe.sh +++ b/.ci/visionary_create_recipe.sh @@ -20,7 +20,7 @@ From: ${DOCKER_BASE_IMAGE} %setup # bind-mount spack-folder as moving involves copying the complete download cache mkdir \${SINGULARITY_ROOTFS}/opt/spack - mount --no-mtab --bind "${WORKSPACE}/spack" "\${SINGULARITY_ROOTFS}/opt/spack" + mount --no-mtab --bind "${YASHCHIKI_SPACK_PATH}" "\${SINGULARITY_ROOTFS}/opt/spack" # bind-mount ccache mkdir \${SINGULARITY_ROOTFS}/opt/ccache mount --no-mtab --bind "${HOME}/spack_ccache" "\${SINGULARITY_ROOTFS}/opt/ccache"