Separating the build caches per environment

ci/apptainer_by_hand.sh

@@ -35,6 +35,7 @@ srun ${srun_options} --pty apptainer run \
     --bind ${CI_DATA_LT}/squashfs-cache/:/squashfs-cache \
     --bind ${CI_DATA_ST}/overlayfs:/overlayfs \
     --bind ${CI_DATA_ST}/deconcretize:/deconcretize \
+    --env LC_ALL=C.UTF-8 \
     --env PYTHONUNBUFFERED=1 \
     --env stack=${stack} \
     --env environment=${environment} \

ci/install.sh

@@ -32,7 +32,7 @@ ${STACK_LOCATION}/spack/bin/spack \
     buildcache create \
     --update-index \
     --key ${GPG_KEY_ID} \
-    ${MOUNT_POINT}/buildcache
+    ${MOUNT_POINT}/buildcache/$environment
 
 echo "Checking ${STACK_CONFIG_PATH}/mark_explicit_${environment} for spec to mark explicit"
 if [ -e ${STACK_CONFIG_PATH}/mark_explicit_${environment} ]

ci/install_compilers.sh

@@ -61,7 +61,7 @@ for c in  "core_compilers" "compilers"; do
             buildcache create \
             --update-index \
             --key ${GPG_KEY_ID} \
-            ${MOUNT_POINT}/buildcache ${hashes}
+            ${MOUNT_POINT}/buildcache/${environment} ${hashes}
 
         for compiler_hash in $(echo ${hashes}); do
             location=$(${STACK_LOCATION}/spack/bin/spack location -i ${compiler_hash})

ci/prepare_squashfs.sh

@@ -9,7 +9,7 @@ mkdir -p ${CI_DATA_ST}/overlayfs
 mkdir -p ${CI_DATA_ST}/homes
 mkdir -p ${CI_DATA_ST}/deconcretize
 
-for i in squashfs-cache buildcache spack-mirror
+for i in squashfs-cache buildcache/$environment spack-mirror
 do
     if [ ! -e ${CI_DATA_LT}/$i ]
     then

ci/setup_spack.sh

@@ -172,9 +172,9 @@ echo "Setting up buildcache"
 spack/bin/spack gpg trust \
     $GPG_PRIVATE_KEY
 
-if [ ! -d ${MOUNT_POINT}/buildcache/build_cache ]; then
+if [ ! -d ${MOUNT_POINT}/buildcache/${environment}/build_cache ]; then
   spack/bin/spack gpg publish \
-      -d ${MOUNT_POINT}/buildcache
+      -d ${MOUNT_POINT}/buildcache/${environment}
 fi
 
 if ! spack/bin/spack mirror list | grep buildcache; then
@@ -182,11 +182,9 @@ if ! spack/bin/spack mirror list | grep buildcache; then
   spack/bin/spack mirror add \
       --type binary \
       --scope system \
-      buildcache file://${MOUNT_POINT}/buildcache
+      buildcache file://${MOUNT_POINT}/buildcache/${environment}
 fi
 
 spack/bin/spack buildcache keys \
     --install \
     --trust
-
-#spack/bin/spack buildcache update-index /buildcache