Merge pull request #97 from DrDaveD/test-ext3

add ci check for fuse2fs mounts
cvmfs · Sep 10, 2024 · d641891 · d641891
2 parents 5aeed5b + 132ce24
commit d641891
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/ci/make-and-test b/ci/make-and-test
@@ -5,6 +5,17 @@
 . /etc/os-release
 
 set -ex
+if [[ "$VERSION_ID" = 7* ]]; then
+    # installing yum-utils for yumdownloader to get fuse2fs fails, skip it
+    CACHEPAT="/var/lib/cvmfs"
+else
+    truncate -s 6G scratch.img
+    mkdir -p scratch/shared
+    /sbin/mkfs.ext3 -F -O ^has_journal -d scratch scratch.img
+    # for mode 4
+    export SINGCVMFS_CACHEIMAGE=scratch.img
+    CACHEPAT="/var/lib/cvmfs.*fuse"
+fi
 for DIST in default osg egi; do
     if [ "$DIST" = egi ] && [[ "$VERSION_ID" != 7* ]]; then
         # egi not yet supported for el8 or el9
@@ -17,8 +28,11 @@ for DIST in default osg egi; do
     ./cvmfsexec atlas.cern.ch -- ls /cvmfs/atlas.cern.ch/repo
     : test self-extracting distribution
     ./makedist -o /tmp/cvmfsexec
-    /tmp/cvmfsexec atlas.cern.ch -- ls /cvmfs/atlas.cern.ch/repo
-    ./makedist -o /tmp/cvmfsexec
+    if [ -f scratch.img ]; then
+        /tmp/cvmfsexec -m $PWD/scratch.img atlas.cern.ch -- ls /cvmfs/atlas.cern.ch/repo /e2fs/lost+found
+    else
+        /tmp/cvmfsexec atlas.cern.ch -- ls /cvmfs/atlas.cern.ch/repo
+    fi
     : test mode 1
     rm -rf dist/var/lib/cvmfs/shared
     ./mountrepo `cd dist/cvmfs; echo *config*`
@@ -46,7 +60,8 @@ for DIST in default osg egi; do
     ./makedist -s $DIST
     ./makedist -s -o /tmp/cvmfsexec
     SINGCVMFS_REPOSITORIES=atlas.cern.ch PATH=$PATH:$PWD/apptainer/bin \
-        ./singcvmfs exec -cip docker://$DOCKER_HUB_URI ls /cvmfs/atlas.cern.ch/repo
+        ./singcvmfs exec -cip docker://$DOCKER_HUB_URI sh -c \
+        "ls /cvmfs/atlas.cern.ch/repo && mount|grep $CACHEPAT"
     if [[ "$VERSION_ID" == 8* ]]; then
         : try to at least make other supported architecture distributions
         for arch in aarch64 ppc64le; do

diff --git a/ci/privileged-run b/ci/privileged-run
@@ -5,10 +5,10 @@
 set -ex
 if [ -f /usr/bin/zypper ]; then
     # suse
-    zypper install -y tar gzip openssl-1_1 fuse fuse3
+    zypper install -y tar gzip openssl-1_1 fuse fuse3 e2fsprogs fuse2fs
 else
     # rhel
-    yum install -y procps-ng cpio findutils fuse fuse3
+    yum install -y procps-ng cpio findutils fuse fuse3 e2fsprogs
     if [[ $DOCKER_HUB_URI == *:8 ]]; then
         yum install -y yum-utils
     fi