Moving update_squashfs

.gitlab-ci.yml

@@ -80,9 +80,9 @@ variables:
          --bind ${CI_DATA}/overlayfs:/overlayfs
          --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA} ${SQUASHFS_ID}-${CI_JOB_ID} ${CI_DATA}/squashfs-cache/${stack}-${environment}-${SQUASHFS_ID}.sqfs /overlayfs/lower-${SQUASHFS_ID}-${CI_JOB_ID}"
          --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${SQUASHFS_ID}-${CI_JOB_ID} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
-  after_script:
-    - if [ $CI_JOB_STATUS != "success" ]; then exit 0; fi
-    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
+  # after_script:
+  #   - if [ $CI_JOB_STATUS != "success" ]; then exit 0; fi
+  #   - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
 
 .spack_cache:
   cache:
@@ -120,6 +120,7 @@ spack:setup:
     - .spack_cache
   script:
     - ci/setup_spack.sh
+    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   needs:
     - job: spack:checkout
 
@@ -132,6 +133,7 @@ spack:install_compilers:
     - ci/install_compilers.sh
     - source ci/stack_env.sh
     - ${STACK_LOCATION}/spack/bin/spack -e ${environment} config blame compilers
+    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   artifacts:
     reports:
       junit: spack-install-*.xml
@@ -154,6 +156,7 @@ spack:concretize:
           concretize | tee concretize-${environment}-${stack}.log
 
     - cp ${SPACK_SYSTEM_CONFIG_PATH}/spack.lock spack-${environment}-${stack}.lock
+    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   artifacts:
     paths:
       - config-*.log
@@ -185,6 +188,12 @@ spack:install:
           --update-index
           --key EDC904DCE3D2E84E
           ${MOUNT_POINT}/buildcache
+
+    - ${STACK_LOCATION}/spack/bin/spack
+          -e ${environment} module
+          lmod refresh --yes | tee spack-modules-${environment}-${stack}.log
+
+    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   needs:
     - job: spack:concretize
   artifacts:
@@ -202,10 +211,6 @@ spack:mksquashfs:
   script:
     - source ci/stack_env.sh
 
-    - ${STACK_LOCATION}/spack/bin/spack
-      -e ${environment} module
-      lmod refresh --yes | tee spack-modules-${environment}-${stack}.log
-
     - echo "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"
     - "mksquashfs ${STACK_LOCATION} stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"
     - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"'

ci/squashfuse_ll.sh

@@ -14,5 +14,4 @@ do
     mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
 done
 
-
 /usr/libexec/apptainer/bin/squashfuse_ll $image $mount_point