diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 767092564af2195d4e0185d9437278aadf93943f..d976a9350f942943ab6ea7f4592f90f5aa6af754 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,13 +35,11 @@ variables: - stack variables: COMMAND_OPTIONS_SBATCH: ${slurm_options} - APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --bind ${STACK_PATH}:/stack:rw --writable-tmpfs + APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}" SPACK_USER_CONFIG_PATH: "/tmp/spack_user_${CI_JOB_ID}" SPACK_SYSTEM_CONFIG_PATH: "/stack/spack/etc" BUILDCACHE: "/work/scitas-ge/richart/ci/buildcache" - STACK_PATH: "/work/scitas-ge/richart/ci/${environment}/stack" - .spack_cache: cache: diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh index f00fc4e283f9bd231b148d0b9073e41a7ad96ce7..b264a39e864207dde65c3448dce81f187aedb3c7 100755 --- a/ci/setup_spack.sh +++ b/ci/setup_spack.sh @@ -2,6 +2,8 @@ SPACK_VERSION=$(jq -r .spack.version config.json) +STACK_LOCATION=$(jq -r .stack.mount_point config.json) + echo "Setting up spack" if [ ! -d spack/.git ]; then git clone https://github.com/spack/spack.git -b $SPACK_VERSION spack @@ -14,7 +16,7 @@ fi cat > spack/etc/spack/config.yaml << EOF config: install_tree: - root: /stack/spack/opt/spack + root: ${STACK_LOCATION}/spack/opt/spack EOF @@ -32,7 +34,7 @@ done echo "Setting up extra repos" -spack_external_repos=/stack/external_repos +spack_external_repos=${STACK_LOCATION}/external_repos mkdir -p ${spack_external_repos} if [ ! -e ${SPACK_SYSTEM_CONFIG_PATH}/repos.yaml ]; then @@ -62,18 +64,18 @@ echo "Setting up buildcache" spack/bin/spack gpg trust \ $GPG_PRIVATE_KEY -spack/bin/spack mirror add \ - --type binary \ - --scope system \ - buildcache file:///buildcache - if [ ! -d /buildcache/build_cache ]; then spack/bin/spack gpg publish \ -d /buildcache fi +spack/bin/spack mirror add \ + --type binary \ + --scope system \ + buildcache file:///buildcache + spack/bin/spack buildcache keys \ --install \ --trust -spack/bin/spack buildcache update-index /buildcache +#spack/bin/spack buildcache update-index /buildcache diff --git a/config.json b/config.json index 0a3fe7783ccbb58a4519602aeae8a3b136ba81f3..cbc0637dea18ffac884317254dbb914c38fcd738 100644 --- a/config.json +++ b/config.json @@ -13,6 +13,7 @@ } }, "stack": { + "mount_point": "/stack", "core_compiler": "gcc@11.4.1 arch=linux-rhel9-x86_64_v2", "compilers": { "gcc": { "spec": "gcc", "version": "12.2.0" },