Adapting mount point for old version of squashfs

.gitlab-ci.yml

@@ -99,7 +99,7 @@ variables:
          --bind ${CI_DATA_ST}/overlayfs:/overlayfs
          --bind ${CI_DATA_ST}/deconcretize:/deconcretize
          --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name}-${CI_JOB_STAGE} ${squashfs_image} ${stack} /overlayfs/lower-${image_name}-${CI_JOB_STAGE}"
-         --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name}-${CI_JOB_STAGE} ${MOUNT_POINT}/${stack}"
+         --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name}-${CI_JOB_STAGE} ${stack} ${MOUNT_POINT}/${stack}"
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------

ci/apptainer_by_hand.sh

 #!/usr/bin/env sh
 
-export CI_DATA_LT="/work/scitas-ge//$(id -un)/ci"
-export CI_DATA_ST="/scratch//$(id -un)/ci"
-srun_options="-N1 -n1 -c 64 -p l40s -q scitas"
-apptainer_options="--nv"
-
 export stack=pinot-noir
 export environment=kuma-l40s
 
+declare -A slurm_options
+slurm_options["helvetios"]="-N1 -n1 -c 36"
+slurm_options["izar"]="-c 40 --gpus 2 -p izar"
+slurm_options["jed"]="-N1 -n1 -c 72 -p jed -q jed"
+slurm_options["kuma-l40s"]="-N1 -n1 -c 64 -q scitas"
+slurm_options["kuma-h100"]="-N1 -n1 -c 64 -q scitas"
+
+declare -A apptainer_options
+apptainer_options["helvetios"]=""
+apptainer_options["izar"]="--nv"
+apptainer_options["jed"]=""
+apptainer_options["kuma-l40s"]="--nv"
+apptainer_options["kuma-h100"]="--nv"
+
+export CI_DATA_LT="/work/scitas-ge//$(id -un)/ci"
+export CI_DATA_ST="/scratch//$(id -un)/ci"
+
 export SQUASHFS_ID=local
 export CI_PIPELINE_ID=1337
 
@@ -27,8 +39,8 @@ image_name=${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}
 
 squashfs_image=$(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
 
-srun ${srun_options} --pty apptainer run \
-    ${apptainer_options} \
+srun ${srun_options[$environment]} --pty apptainer run \
+    ${apptainer_options[$environment]} \
     --writable-tmpfs \
     --cleanenv \
     -H $(mktemp -d -p ${FAKEHOME}/):/home/$(id -un) \
@@ -49,6 +61,6 @@ srun ${srun_options} --pty apptainer run \
     --env CI_DATA_ST=${CI_DATA_ST} \
     --env SQUASHFS_ID=${SQUASHFS_ID} \
     --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${squashfs_image} ${stack} /overlayfs/lower-${image_name}" \
-    --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${MOUNT_POINT}/${stack}" \
+    --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${stack} ${MOUNT_POINT}/${stack}" \
     ${APPTAINER_IMAGE} \
     bash

ci/fuse-overlayfs.sh

 #!/usr/bin/env sh
 
 suffix=$1
-mount_point=$2
+shift
+subdir=$1
+shift
+mount_point=$1
 
 #echo "fuse-overlayfs"
 #echo "    -o squash_to_uid=$(id -u)"
@@ -15,7 +18,7 @@ mount_point=$2
 fuse-overlayfs \
     -o squash_to_uid=$(id -u) \
     -o squash_to_gid=$(id -g) \
-    -o lowerdir=/overlayfs/lower-${suffix} \
+    -o lowerdir=/overlayfs/lower-${suffix}/${subdir} \
     -o upperdir=/overlayfs/upper-${suffix} \
     -o workdir=/overlayfs/wd-${suffix} \
-    $mount_point
+    $*

ci/squashfuse_ll.sh

@@ -22,4 +22,5 @@ done
 #echo "Preparing overlay fs at ${CI_DATA}/overlayfs"
 echo "squashfuse_ll $sqfs_image $mount_point"
 
-/usr/libexec/apptainer/bin/squashfuse_ll -o subdir=${subdir} $sqfs_image $mount_point
+#/usr/libexec/apptainer/bin/squashfuse_ll -o subdir=${subdir} $sqfs_image $mount_point
+/usr/libexec/apptainer/bin/squashfuse_ll  $sqfs_image $mount_point