Merge pull request #220 from rynge/apptainer-fix

Use a local apptainer - the cvmfs one has shared lib deps

Author: matyasselmeci

.github/workflows/build-container.yml

@@ -59,6 +59,14 @@ jobs:
           output_image: ${{ steps.custom-image-name.outputs.output_image }}
           timestamp: ${{ steps.custom-image-name.outputs.timestamp }}
 
+      
+      - name: Prepare Image
+        # TODO: For all tests, GHA currently only supports amd64 runners. We will need
+        # to re-enable tests on arm64 when ARM runners become available.
+        if: ${{ matrix.arch == 'amd64' }}
+        run: |
+          sudo ./tests/setup_gha_image.sh
+
 
       - name: Prepare CVMFS
         # TODO: For all tests, GHA currently only supports amd64 runners. We will need

tests/setup_gha_image.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -x
+
+function install_apptainer {
+    # https://apptainer.org/docs/admin/main/installation.html#install-ubuntu-packages
+    apt -y update
+    apt install -y software-properties-common
+    add-apt-repository -y ppa:apptainer/ppa
+    apt -y update
+    apt install -y apptainer
+}
+
+install_apptainer

tests/test_inside_gha.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -x
 # shellcheck disable=SC2086
 
-APPTAINER_BIN=/cvmfs/oasis.opensciencegrid.org/mis/apptainer/bin/apptainer
+APPTAINER_BIN=/usr/bin/apptainer
 OSP_TOKEN_PATH=/tmp/token
 CONDOR_LOGDIR=/pilot/log
 COMMON_APPTAINER_EXEC_ARGS="-B /cvmfs -B /dev/fuse -c -i"