More fixes on the overlays

.gitlab-ci.yml

@@ -105,10 +105,14 @@ spack:checkout:
   before_script:
     - git config --global --add --bool advice.detachedHead false
   script:
-    - mkdir -p ${CI_DATA}/overlayfs/
-    - mkdir -p ${CI_DATA}/squashfs-cache
-    - mkdir -p ${CI_DATA}/buildcache
-    - mkdir -p ${CI_DATA}/spack-mirror
+    - |
+      for i in overlayfs squashfs-cache buildcache spack-mirror
+      do
+        if [ ! -e ${CI_DATA}/$i ]
+        then
+          mkdir -p ${CI_DATA}/$i
+        fi
+      done
     - ./ci/prepare_squashfs.sh
   timeout: 1h
 

ci/apptainer_by_hand.sh

 #!/usr/bin/env sh
 
-CI_DATA="/work/scitas-ge/richart/ci"
+CI_DATA="/scratch/richart/ci"
 srun_options="-N1 -n1 -c 64 -p h100"
 apptainer_options="--nv"
 
@@ -18,10 +18,14 @@ MOUNT_POINT=$(jq -Mrc .stack.mount_point ${CI_PROJECT_DIR}/stacks/${stack}/confi
 
 APPTAINER_IMAGE=~/rhel9-kuma.sif
 
-mkdir -p ${CI_DATA}/overlayfs/{lower,upper,wd}-${SQUASHFS_ID}
-mkdir -p ${CI_DATA}/squashfs-cache
-mkdir -p ${CI_DATA}/buildcache
-mkdir -p ${CI_DATA}/spack-mirror
+for i in overlayfs squashfs-cache buildcache spack-mirror
+do
+    if [ ! -e ${CI_DATA}/$i ]
+    then
+        mkdir -p ${CI_DATA}/$i
+    fi
+done
+
 
 if [ ! -f ${CI_DATA}/squashfs-cache/${stack}-${environment}-${SQUASHFS_ID}.sqfs ]
 then

ci/prepare_squashfs.sh

@@ -5,56 +5,39 @@ set -o nounset
 
 source ${CI_PROJECT_DIR}/ci/stack_env.sh
 
-if [ ! -d /squashfs-cache ]
-then
-    mkdir -p /squashfs-cache
-fi
-
 # Check if MR as squashfs
-sqfs_image=$(ls -t1 /squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1)
+sqfs_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1)
 if [ $? -ne 0 ]
 then
     echo "No MR ($squash_id) squashfs found"
     # Check if MR default branch as squashfs
-    sqfs_base_image=$(ls -t1 /squashfs-cache/${stack}-${environment}-${squash_base}*.sqfs 2> /dev/null | head -1)
+    sqfs_base_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_base}*.sqfs 2> /dev/null | head -1)
     if [ $? -ne 0 ]
     then
         echo "No default branch ($squash_base) squashfs found"
         echo "Creating an empty one"
         empty=$(mktemp -d)
-        sqfs_base_image=/squashfs-cache/${stack}-${environment}-${squash_base}-initial.sqfs
+        sqfs_base_image="${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_base}-initial.sqfs"
         mksquashfs ${empty} ${sqfs_base_image}
     else
         echo "Found ${sqfs_base_image}"
     fi
 
     # Link MR sqaushfs to the one of default branch
-    sqfs_image=/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs
+    sqfs_image=${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs
 
-    cd /squashfs-cache
+    cd ${CI_DATA}/squashfs-cache
     ln -sf $(basename ${sqfs_base_image}) $(basename ${sqfs_image})
     cd -
 
     echo "Linking ${sqfs_image} -> ${sqfs_base_image}"
 else
-    if [ ${sqfs_image} != /squashfs-cache/${stack}-${environment}-${squash_id}.sqfs ];
+    if [ ${sqfs_image} != ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs ];
     then
-        cd /squashfs-cache
+        cd ${CI_DATA}/squashfs-cache
         ln -sf $(basname ${sqfs_image}) ${stack}-${environment}-${squash_id}.sqfs
         cd
     fi
     echo "Found ${sqfs_image}"
 fi
 
-
-if [ ! -d /overlayfs ]
-then
-    mkdir -p /overlayfs
-fi
-
-if [ ! -d /overlayfs/upper ]
-then
-    mkdir -p /overlayfs/lower
-    mkdir -p /overlayfs/upper
-    mkdir -p /overlayfs/wd
-fi