From 69d78e65c604e9219304d55e640e897c84c9c658 Mon Sep 17 00:00:00 2001
From: Valentin Volkl <valentin.volkl@cern.ch>
Date: Sat, 4 Jan 2025 13:19:53 +0100
Subject: [PATCH] Use cvmrepo.s3.cern.ch as cvmfs package download url

This is strictly better and removes one point of failure.
Packages are downloaded anyway from s3.cern.ch, so it's better to
rely on this url than to introduce one more host.

Next step will be to update the cvmfs-release package with a failover to cvmrepo.web.cern.ch, then
this should be really robust.

A note on Amazonlinux 2023: this didn't work when I tested it with the amazonlinux docker image
as 2023 uses (micro-)dnf instead of yum. Even s/yum/dnf/ didn't work as micro-dnf doesn't seem to support
installing local packages (?). For the release package, also the redhat-release dependency was not supported.

I'll take a look into adding a yum repo for amazonlinux, if it can really just link to the centos7/9 packages that should
be very easy to do and let you remove this workaround.
---
 scripts/install_cvmfs_eessi.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/install_cvmfs_eessi.sh b/scripts/install_cvmfs_eessi.sh
index e2d7b59..87bc8c5 100755
--- a/scripts/install_cvmfs_eessi.sh
+++ b/scripts/install_cvmfs_eessi.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Note: The cvmfs package server has a browseable mirror under
+# https://cvmrepo.s3.cern.ch/cvmrepo -> https://cvmrepo.web.cern.ch/cvmrepo
 
 # Dry run function
 dry_run() {
@@ -46,14 +48,14 @@ then
       exit 1
     fi
     # Install CVMFS (without a yum repo for Amazon Linux), config file first, then CVMFS itself
-    AMAZON_LINUX_CVMFS_VERSION=2.11.2
+    AMAZON_LINUX_CVMFS_VERSION=2.11.5
     AMAZON_LINUX_CVMFS_PACKAGE_VERSION=${AMAZON_LINUX_CVMFS_VERSION}-1
-    dry_run "yum install -y http://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm"
-    dry_run "yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-${AMAZON_LINUX_CVMFS_VERSION}/cvmfs-libs-${AMAZON_LINUX_CVMFS_PACKAGE_VERSION}.el${rhel_version}.$(uname -m).rpm"
-    dry_run "yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-${AMAZON_LINUX_CVMFS_VERSION}/cvmfs-${AMAZON_LINUX_CVMFS_PACKAGE_VERSION}.el${rhel_version}.$(uname -m).rpm"
+    dry_run "yum install -y https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config-default-latest.noarch.rpm"
+    dry_run "yum install -y https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/${rhel_version}/$(uname -m)/cvmfs-libs-${AMAZON_LINUX_CVMFS_PACKAGE_VERSION}.el${rhel_version}.$(uname -m).rpm"
+    dry_run "yum install -y https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/${rhel_version}/$(uname -m)/cvmfs-${AMAZON_LINUX_CVMFS_PACKAGE_VERSION}.el${rhel_version}.$(uname -m).rpm"
   else
     # Assume everything else is RHEL-like (install the yum repo and then cvmfs)
-    dry_run "yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm"
+    dry_run "yum install -y https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-release-latest.noarch.rpm"
     dry_run "yum install -y cvmfs"
   fi
   # Install the EESSI configuration (not strictly necessary as software.eessi.io ships in the default)
@@ -62,7 +64,7 @@ elif [[ "${ID_LIKE}" =~ "debian" ]] || [[ "${ID}" =~ "debian" ]]
 then
   dry_run "apt-get update"
   dry_run "apt-get install -y lsb-release wget"
-  dry_run "wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb"
+  dry_run "wget https://cvmrepo.s3.cern.ch/cvmrepo/apt/cvmfs-release-latest_all.deb"
   dry_run "dpkg -i cvmfs-release-latest_all.deb"
   dry_run "rm -f cvmfs-release-latest_all.deb"
   dry_run "apt-get update"