Taking latest squashfs without symlink

.gitlab-ci.yml

@@ -72,6 +72,7 @@ variables:
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
     STACK_VERSION: $(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
     image_name: "${stack}-${environment}-${SQUASHFS_ID}"
+    squashfs_image: $(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
     APPTAINER_EXEC_OPTIONS: >-
       ${apptainer_options}
          --cleanenv
@@ -80,7 +81,7 @@ variables:
          --bind ${CI_DATA_LT}/spack-mirror:${MOUNT_POINT}/spack-mirror
          --bind ${CI_DATA_ST}/squashfs-cache/:/squashfs-cache
          --bind ${CI_DATA_ST}/overlayfs:/overlayfs
-         --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${CI_DATA_LT}/squashfs-cache /overlayfs/lower-${image_name}"
+         --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${squashfs_image} /overlayfs/lower-${image_name}"
          --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
   # after_script:
   #   - if [ $CI_JOB_STATUS != "success" ]; then exit 0; fi

ci/apptainer_by_hand.sh

@@ -20,6 +20,7 @@ export STACK_VERSION=$(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/
 
 APPTAINER_IMAGE=~/rhel9-kuma.sif
 image_name=${stack}-${environment}-${SQUASHFS_ID}
+squashfs_image=$(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
 #./ci/prepare_squashfs.sh
 
 srun ${srun_options} --pty apptainer run \
@@ -37,7 +38,7 @@ srun ${srun_options} --pty apptainer run \
     --env CI_PROJECT_DIR=${CI_PROJECT_DIR} \
     --env CI_JOB_ID=${CI_JOB_ID} \
     --env SQUASHFS_ID=${SQUASHFS_ID} \
-    --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${CI_DATA_LT}/squashfs-cache /overlayfs/lower-${image_name}" \
+    --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${squashfs_image} /overlayfs/lower-${image_name}" \
     --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}" \
     ${APPTAINER_IMAGE} \
     bash

ci/squashfuse_ll.sh

 #!/usr/bin/env sh
 
 CI_DATA=$1
-suffix=$2
-image_path=$3
-mount_point=$4
+shift
+suffix=$1
+shift
+sqfs_image=$1
+shift
+mount_point="$*"
 
 for i in upper wd
 do
@@ -14,6 +17,5 @@ do
     mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
 done
 
-image=${image_path}/${suffix}.sqfs
-
-/usr/libexec/apptainer/bin/squashfuse_ll $image $mount_point
+#echo "/usr/libexec/apptainer/bin/squashfuse_ll $sqfs_image $mount_point"
+/usr/libexec/apptainer/bin/squashfuse_ll $sqfs_image $mount_point

ci/update_squashfs.sh

@@ -10,4 +10,4 @@ cd /squashfs-cache
 
 mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${squash_id}-$(date +'%Y%m%d_%H%M').sqfs
 
-ln -sf ${stack}-${environment}-${squash_id}-$(date +'%Y%m%d_%H%M').sqfs ${stack}-${environment}-${squash_id}.sqfs
+#ln -sf ${stack}-${environment}-${squash_id}-$(date +'%Y%m%d_%H%M').sqfs ${stack}-${environment}-${squash_id}.sqfs