Merge pull request #117 from DrDaveD/disable-el7

Disable rhel7-x86_64 with osg, update to 4.48

Author: DrDaveD

.github/workflows/build.yml

@@ -38,6 +38,8 @@ jobs:
             version: 11
           - distro: debian
             version: 12
+          - distro: debian
+            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu

ChangeLog

@@ -1,3 +1,9 @@
+cvmfsexec-4.48 - 11 September 2025
+- Remove support for el7 in the osg and egi distributions because it is broken;
+  the version of cvmfs in the last osg and egi distros that supported it does
+  not match what is available to download from CERN anymore.
+- Add support for debian 13
+
 cvmfsexec-4.47 - 19 May 2025
 - Remove setting X509_USER_PROXY because it is no longer used.
 

ci/make-and-test

@@ -17,8 +17,12 @@ else
     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
+    if [ "$DIST" = egi ] && ( [[ "$VERSION_ID" = 7* ]] || [[ "$VERSION_ID" = 8* ]] || [ "$VERSION_ID" = 11 ] ); then
+        # egi only supported on el9 and debian 12+
+        continue
+    fi
+    if [ "$DIST" = osg ] && [[ "$VERSION_ID" = 7* ]]; then
+        # osg not supported anymore for el7
         continue
     fi
     rm -rf dist /tmp/cvmfsexec
@@ -68,12 +72,16 @@ for DIST in default osg egi; do
         "ls /cvmfs/atlas.cern.ch/repo && mount|grep $CACHEPAT"
     if [[ "$VERSION_ID" == 8* ]] || [[ "$VERSION_ID" == 9* ]]; then
         : try to at least make other supported architecture distributions
+        EL=${VERSION_ID%.*}
+        if [ "$DIST" = egi ] && [ "$EL" = 8 ]; then
+            continue
+        fi
         for arch in aarch64 ppc64le; do
             rm -rf dist /tmp/cvmfsexec
-            ./makedist -m rhel8-$arch $DIST
+            ./makedist -m rhel$EL-$arch $DIST
             ./makedist -o /tmp/cvmfsexec
             rm -rf dist /tmp/cvmfsexec
-            ./makedist -s -m rhel8-$arch $DIST
+            ./makedist -s -m rhel$EL-$arch $DIST
             ./makedist -s -o /tmp/cvmfsexec
         done
     fi

ci/privileged-run

@@ -9,7 +9,7 @@ if [ -f /usr/bin/zypper ]; then
 elif [ -f /usr/bin/apt ]; then
     # debian or ubuntu
     apt-get update
-    apt-get install -y procps curl rpm2cpio cpio fuse3 fuse2fs
+    apt-get install -y procps curl rpm2cpio cpio fuse3 e2fsprogs fuse2fs 
 else
     # rhel
     yum install -y procps-ng cpio findutils fuse fuse3 e2fsprogs

cvmfsexec

@@ -9,7 +9,7 @@
 #set -x
 #PS4='c$$+ '
 
-VERSION=4.47
+VERSION=4.48
 
 usage()
 {

makedist

@@ -141,8 +141,8 @@ if [ -z "$MACHTYPE" ]; then
         fi
         case "$VERS" in
             11) DISTRO=rhel; VERS=8;;
-            12) DISTRO=rhel; VERS=9;;
-            *)  echo "debian$VERS not supported, only 11 & 12 are" >&2
+            12|13) DISTRO=rhel; VERS=9;;
+            *)  echo "debian$VERS not supported, only 11 through 13 are" >&2
                 exit 2;;
         esac
     elif [ "$DISTRO" = "ubuntu" ]; then
@@ -241,24 +241,19 @@ case $1 in
         ;;
     osg)
         if [ $EL -lt 8 ]; then
-            REL=3.6
-            EXT=""
-        else
-            REL=24-main
-            EXT="/Packages/c"
+            echo "ERROR: unsupported OS for osg! Only rhel8 and up supported" >&2
+            exit 1
         fi
-        REPO=release
-        BASEURL="https://repo.opensciencegrid.org/osg/$REL/el$EL/$REPO/x86_64$EXT"
+        BASEURL="https://repo.opensciencegrid.org/osg/24-main/el$EL/release/x86_64/Packages/c"
         BASELIST="$(get_cvmfs_pkg_list $BASEURL)";;
     egi)
-        OS=centos$EL
-        if [ $EL -gt 8 ]; then
+        if [ $EL = 9 ] || ( [ $DISTRO = suse ] && [ $EL = 8 ] ); then
+             # In the suse case we don't actually get much from the egi
+             # distribution so the version mismatch is ok
              BASEURL="https://repository.egi.eu/sw/production/umd/5/al9/release/x86_64/"
-        elif [ $EL -eq 7 ]; then
-            BASEURL="https://repository.egi.eu/sw/production/umd/4/centos7/x86_64/updates"
         else
-          echo "ERROR: unsupported OS for egi! only centos7, almalinux9 supported." >&2
-          exit 1
+            echo "ERROR: unsupported OS for egi! Only rhel9 is supported" >&2
+            exit 1
         fi 
         BASELIST="$(get_cvmfs_pkg_list $BASEURL)";;
     default|none)
@@ -309,11 +304,6 @@ if [ "$ARCH" != "x86_64" ]; then
     #  we're looking at x86_64 version repositories for the config rpm
     INCLUDEHELPER=false
 fi
-if [ "$DISTTYPE" = egi ] && [ "$EL" = 8 ]; then
-    echo "egi's UMD does not yet support rhel8" 2>&1
-    exit 1
-fi
-
 
 URLS=""
 CVMFSURL=""

singcvmfs

@@ -3,7 +3,7 @@
 #   with the singularity --fusemount option.
 # Written by Dave Dykstra March 2020
 
-VERSION=4.47
+VERSION=4.48
 
 ME="`basename $0`"