Skip to content
Snippets Groups Projects
Commit f55dce43 authored by Nicolas Richart's avatar Nicolas Richart
Browse files

overlayfs did not work moved things to squashfuse

parent 0093376a
No related branches found
No related tags found
1 merge request!2CI update to use squashfs
Pipeline #201491 failed
......@@ -78,8 +78,8 @@ variables:
--bind ${CI_DATA}/spack-mirror:${MOUNT_POINT}/spack-mirror
--bind ${CI_DATA}/squashfs-cache/:/squashfs-cache
--bind ${CI_DATA}/overlayfs:/overlayfs
--fusemount "host:/usr/libexec/apptainer/bin/squashfuse_ll ${CI_DATA}/squashfs-cache/${stack}-${environment}-${SQUASHFS_ID}.sqfs /overlayfs/lower-${SQUASHFS_ID}-${CI_JOB_ID}"
--fusemount "host:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${CI_DATA} ${SQUASHFS_ID}-${CI_JOB_ID} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
--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
......
......@@ -19,7 +19,7 @@ export STACK_VERSION=$(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/
APPTAINER_IMAGE=~/rhel9-kuma.sif
./ci/prepare_squashfs.sh
#./ci/prepare_squashfs.sh
echo "host:/usr/libexec/apptainer/bin/squashfuse_ll ${CI_DATA}/squashfs-cache/${stack}-${environment}-${SQUASHFS_ID}.sqfs /overlayfs/lower-${SQUASHFS_ID}-${CI_JOB_ID}"
echo "host:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${CI_DATA} ${SQUASHFS_ID}-${CI_JOB_ID} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
......@@ -39,7 +39,7 @@ srun ${srun_options} --pty apptainer run \
--env CI_PROJECT_DIR=${CI_PROJECT_DIR} \
--env CI_JOB_ID=${CI_JOB_ID} \
--env SQUASHFS_ID=${SQUASHFS_ID} \
--fusemount "host:/usr/libexec/apptainer/bin/squashfuse_ll ${CI_DATA}/squashfs-cache/${stack}-${environment}-${SQUASHFS_ID}.sqfs /overlayfs/lower-${SQUASHFS_ID}-${CI_JOB_ID}" \
--fusemount "host:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${CI_DATA} ${SQUASHFS_ID}-${CI_JOB_ID} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}" \
--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}" \
${APPTAINER_IMAGE} \
bash
#!/usr/bin/env sh
CI_DATA=$1
suffix=$2
mount_point=$3
suffix=$1
mount_point=$2
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 \
#/usr/libexec/apptainer/bin/fuse-overlayfs \
fuse-overlayfs \
-o squash_to_uid=$(id -u) \
-o squash_to_gid=$(id -g) \
-o lowerdir=${CI_DATA}/overlayfs/lower-${suffix} \
-o upperdir=${CI_DATA}/overlayfs/upper-${suffix} \
-o workdir=${CI_DATA}/overlayfs/wd-${suffix} \
-o lowerdir=/overlayfs/lower-${suffix} \
-o upperdir=/overlayfs/upper-${suffix} \
-o workdir=/overlayfs/wd-${suffix} \
$mount_point
......@@ -13,7 +13,6 @@ do
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 ]
......@@ -49,4 +48,3 @@ else
fi
echo "Found ${sqfs_image}"
fi
#!/usr/bin/env sh
CI_DATA=$1
suffix=$2
image=$3
mount_point=$4
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/squashfuse_ll $image $mount_point
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment