Still trying to deploy

.gitlab-ci.yml

@@ -97,7 +97,7 @@ variables:
          --bind ${CI_DATA_LT}/squashfs-cache/:/squashfs-cache
          --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 "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name}-${CI_JOB_STAGE} ${squashfs_image} /overlayfs/lower-${image_name}-${CI_JOB_STAGE}"
          --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name}-${CI_JOB_STAGE} ${stack} ${MOUNT_POINT}/${stack}"
 
 # ------------------------------------------------------------------------------
@@ -184,6 +184,22 @@ spack:install:
       junit: spack-install-*.xml
   timeout: 72h
 
+spack:deploy_pre
+  stage: deploy
+  extends:
+    - .parallel_definition
+  tags:
+    - scitasbuild
+  variables:
+    COMMAND_OPTIONS_SBATCH: "-c 36"
+  script:
+    - hostname
+  needs:
+    - job: spack:install
+  timeout: 5min
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
 spack:deploy:
   stage: deploy
   extends:
@@ -197,13 +213,13 @@ spack:deploy:
     squashfs_image: $(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
     APPTAINER_EXEC_OPTIONS: >-
       --bind ${MOUNT_POINT}
-      --fusemount "host:/usr/libexec/apptainer/bin/squashfuse_ll ${squashfs_image} /squashfs"
+      --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh /does_not_exists ${image_name}-${CI_JOB_STAGE} ${squashfs_image} /squashfs"
   script:
     - ls /squashfs
     - ls ${MOUNT_POINT}
     - rsync --dry-run -au /squashfs/${stack}/ ${MOUNT_POINT}/${stack}/
   needs:
-    - job: spack:install
+    - job: spack:deploy_pre
   timeout: 2h
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

ci/apptainer_by_hand.sh

@@ -59,7 +59,7 @@ srun ${slurm_options[$environment]} --time 1-0:0:0 --pty apptainer run \
     --env CI_DATA_LT=${CI_DATA_LT} \
     --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 "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} ${stack} ${MOUNT_POINT}/${stack}" \
     ${APPTAINER_IMAGE} \
     bash

ci/squashfuse_ll.sh

@@ -6,21 +6,17 @@ suffix=$1
 shift
 sqfs_image=$1
 shift
-subdir=$1
-shift
 mount_point="$*"
 
-for i in upper wd
-do
-    # if [ -d ${CI_DATA}/overlayfs/$i-${suffix} ]
-    # then
-    #     rm -rf ${CI_DATA}/overlayfs/$i-${suffix}
-    # fi
-    mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
-done
+if [ -d ${CI_DATA} ]
+then
+    for i in upper wd
+    do
+        mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
+    done
+fi
 
 #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  $sqfs_image $mount_point