From df2c8686aae43ad246e3b422fe4a848fa62b807d Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Sat, 20 Jul 2024 00:03:06 +0200
Subject: [PATCH] More correction of stuffs
---
.gitlab-ci.yml | 2 +-
ci/fuse-overlayfs.sh | 9 ++++++++-
ci/prepare_squashfs.sh | 9 +++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 619d655..43d5998 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ variables:
then
exit 0
fi
- - ./ci/update_squashfs.sh
+ - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
.spack_cache:
cache:
diff --git a/ci/fuse-overlayfs.sh b/ci/fuse-overlayfs.sh
index d6db316..f9723f0 100755
--- a/ci/fuse-overlayfs.sh
+++ b/ci/fuse-overlayfs.sh
@@ -4,7 +4,14 @@ CI_DATA=$1
suffix=$2
mount_point=$3
-mkdir -p ${CI_DATA}/overlayfs/{upper,wd}-${suffix}
+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
/usr/libexec/apptainer/bin/fuse-overlayfs \
-o squash_to_uid=$(id -u) \
diff --git a/ci/prepare_squashfs.sh b/ci/prepare_squashfs.sh
index 27465a1..178c2a8 100755
--- a/ci/prepare_squashfs.sh
+++ b/ci/prepare_squashfs.sh
@@ -5,6 +5,15 @@ set -o nounset
source ${CI_PROJECT_DIR}/ci/stack_env.sh
+for i in overlayfs squashfs-cache buildcache spack-mirror
+do
+ if [ ! -e ${CI_DATA}/$i ]
+ then
+ mkdir -p ${CI_DATA}/$i
+ fi
+done
+
+
# Check if MR as squashfs
sqfs_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1)
if [ $? -ne 0 ]
--
GitLab