From 7c7e1b1ff18c960db5f1233438295d9c60dd6431 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 26 Mar 2024 20:18:03 +0100
Subject: [PATCH 1/2] use older apptainer (1.2.4)

---
 install_apptainer_ubuntu.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/install_apptainer_ubuntu.sh b/install_apptainer_ubuntu.sh
index c35c34cda6..6cf9a6f48e 100755
--- a/install_apptainer_ubuntu.sh
+++ b/install_apptainer_ubuntu.sh
@@ -5,8 +5,11 @@ set -e
 # see https://github.com/apptainer/singularity/issues/5390#issuecomment-899111181
 sudo apt-get install alien
 alien --version
-apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
-curl -OL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/${apptainer_rpm}
+#apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
+#curl -OL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/${apptainer_rpm}
+#/pub/archive/epel/8.8/Everything/x86_64/Packages/a
+apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/archive/epel/8.8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
+curl -OL https://dl.fedoraproject.org/pub/archive/epel/8.8/Everything/x86_64/Packages/a/${apptainer_rpm}
 sudo alien -d ${apptainer_rpm}
 sudo apt install ./apptainer*.deb
 apptainer --version

From deb12e9fef3103b8c07504e745b14fe366ed618d Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 26 Mar 2024 20:35:40 +0100
Subject: [PATCH 2/2] clean up downloading RPM for Apptainer < 1.3.0 RPM from
 EPEL 8.8 archive, for now

---
 install_apptainer_ubuntu.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/install_apptainer_ubuntu.sh b/install_apptainer_ubuntu.sh
index 6cf9a6f48e..5eb513db2c 100755
--- a/install_apptainer_ubuntu.sh
+++ b/install_apptainer_ubuntu.sh
@@ -5,11 +5,13 @@ set -e
 # see https://github.com/apptainer/singularity/issues/5390#issuecomment-899111181
 sudo apt-get install alien
 alien --version
-#apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
-#curl -OL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/${apptainer_rpm}
-#/pub/archive/epel/8.8/Everything/x86_64/Packages/a
-apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/archive/epel/8.8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
-curl -OL https://dl.fedoraproject.org/pub/archive/epel/8.8/Everything/x86_64/Packages/a/${apptainer_rpm}
+# stick to Apptainer < 1.3.0 by downloading from EPEL 8.8 archive,
+# since CI workflow for testing scripts hangs/fails when using Apptainer 1.3.0
+# cfr. https://github.com/EESSI/software-layer/pull/514
+epel_subdir="pub/epel/8"
+epel_subdir="pub/archive/epel/8.8"
+apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/${epel_subdir}/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
+curl -OL https://dl.fedoraproject.org/${epel_subdir}/Everything/x86_64/Packages/a/${apptainer_rpm}
 sudo alien -d ${apptainer_rpm}
 sudo apt install ./apptainer*.deb
 apptainer --version