From 3ec2b330a9f7582afa8248f71bf3b9ca96172584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 22 Apr 2024 15:45:24 +0200 Subject: [PATCH 1/5] add deprecation message to 2021.12 pilot --- versions/2021.12/init/Magic_Castle/bash | 13 ++++++++++ versions/2021.12/init/bash | 12 +++++++++ .../2021.12/init/print_deprecation_warning.sh | 26 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 versions/2021.12/init/Magic_Castle/bash create mode 100644 versions/2021.12/init/bash create mode 100755 versions/2021.12/init/print_deprecation_warning.sh diff --git a/versions/2021.12/init/Magic_Castle/bash b/versions/2021.12/init/Magic_Castle/bash new file mode 100644 index 0000000000..408b9fb058 --- /dev/null +++ b/versions/2021.12/init/Magic_Castle/bash @@ -0,0 +1,13 @@ +/cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/print_deprecation_warning.sh + +if [ ! -z ${EESSI_FORCE_PILOT} ]; then + echo "Setting up the pilot repository, because \$EESSI_FORCE_PILOT is set..." + source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash.force +elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then + echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." + echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" +else + echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." + source /cvmfs/software.eessi.io/versions/2023.06/init/bash +fi +source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/Magic_Castle/bash diff --git a/versions/2021.12/init/bash b/versions/2021.12/init/bash new file mode 100644 index 0000000000..ff69f394fa --- /dev/null +++ b/versions/2021.12/init/bash @@ -0,0 +1,12 @@ +/cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/print_deprecation_warning.sh + +if [ ! -z ${EESSI_FORCE_PILOT} ]; then + echo "Setting up the pilot repository, because \$EESSI_FORCE_PILOT is set..." + source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash.force +elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then + echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." + echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" +else + echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." + source /cvmfs/software.eessi.io/versions/2023.06/init/bash +fi diff --git a/versions/2021.12/init/print_deprecation_warning.sh b/versions/2021.12/init/print_deprecation_warning.sh new file mode 100755 index 0000000000..f3a9465639 --- /dev/null +++ b/versions/2021.12/init/print_deprecation_warning.sh @@ -0,0 +1,26 @@ +#!/bin/bash +function echo_yellow_stderr() { + echo -e "\e[33m${1}\e[0m" >&2 +} + +echo_yellow_stderr +echo_yellow_stderr "WARNING: the EESSI pilot repository is deprecated and no longer supported." +echo_yellow_stderr +echo_yellow_stderr "We strongly recommend to switch to the EESSI production repository (software.eessi.io)." +echo_yellow_stderr "See https://www.eessi.io/docs/repositories/software.eessi.io/ for more information." +echo_yellow_stderr +echo_yellow_stderr "You can find instructions for making the production repository available at:" +echo_yellow_stderr "https://www.eessi.io/docs/getting_access/is_eessi_accessible/" +echo_yellow_stderr +echo_yellow_stderr "If the production repository is available on your system, please run" +echo_yellow_stderr +echo_yellow_stderr " source /cvmfs/software.eessi.io/versions/2023.06/init/bash" +echo_yellow_stderr +echo_yellow_stderr "to prepare your environment for using the EESSI production repository." +echo_yellow_stderr +echo_yellow_stderr "See also https://eessi.github.io/docs/using_eessi/setting_up_environment." +echo_yellow_stderr +echo_yellow_stderr "This script will now try to automatically switch to the production repository," +echo_yellow_stderr "unless it's not available or if \$EESSI_FORCE_PILOT is set." +echo_yellow_stderr +echo_yellow_stderr From 765d5094cc00fd505e4804862ff995e6ae4f95f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 1 May 2024 13:13:34 +0200 Subject: [PATCH 2/5] point to support portal --- versions/2021.12/init/print_deprecation_warning.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/versions/2021.12/init/print_deprecation_warning.sh b/versions/2021.12/init/print_deprecation_warning.sh index f3a9465639..634327c594 100755 --- a/versions/2021.12/init/print_deprecation_warning.sh +++ b/versions/2021.12/init/print_deprecation_warning.sh @@ -20,6 +20,9 @@ echo_yellow_stderr "to prepare your environment for using the EESSI production r echo_yellow_stderr echo_yellow_stderr "See also https://eessi.github.io/docs/using_eessi/setting_up_environment." echo_yellow_stderr +echo_yellow_stderr "If you have any questions or if you need any help, please open a support ticket:" +echo_yellow_stderr "https://www.eessi.io/docs/support" +echo_yellow_stderr echo_yellow_stderr "This script will now try to automatically switch to the production repository," echo_yellow_stderr "unless it's not available or if \$EESSI_FORCE_PILOT is set." echo_yellow_stderr From 8c6a69ca3334ea8477a212398638d05be1afea04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 1 May 2024 13:17:48 +0200 Subject: [PATCH 3/5] source bash.force in case prod repo is not available --- versions/2021.12/init/bash | 1 + 1 file changed, 1 insertion(+) diff --git a/versions/2021.12/init/bash b/versions/2021.12/init/bash index ff69f394fa..b91b18edf4 100644 --- a/versions/2021.12/init/bash +++ b/versions/2021.12/init/bash @@ -6,6 +6,7 @@ if [ ! -z ${EESSI_FORCE_PILOT} ]; then elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" + source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash.force else echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." source /cvmfs/software.eessi.io/versions/2023.06/init/bash From 9292f2ad3225f5801ef2aa362c4cc92a5fbde455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 1 May 2024 13:21:52 +0200 Subject: [PATCH 4/5] fix magic castle init script --- versions/2021.12/init/Magic_Castle/bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/2021.12/init/Magic_Castle/bash b/versions/2021.12/init/Magic_Castle/bash index 408b9fb058..1b11c820be 100644 --- a/versions/2021.12/init/Magic_Castle/bash +++ b/versions/2021.12/init/Magic_Castle/bash @@ -2,12 +2,12 @@ if [ ! -z ${EESSI_FORCE_PILOT} ]; then echo "Setting up the pilot repository, because \$EESSI_FORCE_PILOT is set..." - source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash.force + source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/Magic_Castle/bash.force elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" + source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/Magic_Castle/bash.force else echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." - source /cvmfs/software.eessi.io/versions/2023.06/init/bash + source /cvmfs/software.eessi.io/versions/2023.06/init/Magic_Castle/bash fi -source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/Magic_Castle/bash From 5cbbe56e5c3a5169a0d08218e28f5eafa6ca9ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 1 May 2024 13:22:03 +0200 Subject: [PATCH 5/5] deprecate 2023.06 too --- versions/2023.06/init/Magic_Castle/bash | 13 +++++++++ versions/2023.06/init/bash | 13 +++++++++ .../2023.06/init/print_deprecation_warning.sh | 29 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 versions/2023.06/init/Magic_Castle/bash create mode 100644 versions/2023.06/init/bash create mode 100755 versions/2023.06/init/print_deprecation_warning.sh diff --git a/versions/2023.06/init/Magic_Castle/bash b/versions/2023.06/init/Magic_Castle/bash new file mode 100644 index 0000000000..91620022c1 --- /dev/null +++ b/versions/2023.06/init/Magic_Castle/bash @@ -0,0 +1,13 @@ +/cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/print_deprecation_warning.sh + +if [ ! -z ${EESSI_FORCE_PILOT} ]; then + echo "Setting up the pilot repository, because \$EESSI_FORCE_PILOT is set..." + source /cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/Magic_Castle/bash.force +elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then + echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." + echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" + source /cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/Magic_Castle/bash.force +else + echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." + source /cvmfs/software.eessi.io/versions/2023.06/init/Magic_Castle/bash +fi diff --git a/versions/2023.06/init/bash b/versions/2023.06/init/bash new file mode 100644 index 0000000000..3d7d4c34e0 --- /dev/null +++ b/versions/2023.06/init/bash @@ -0,0 +1,13 @@ +/cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/print_deprecation_warning.sh + +if [ ! -z ${EESSI_FORCE_PILOT} ]; then + echo "Setting up the pilot repository, because \$EESSI_FORCE_PILOT is set..." + source /cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/bash.force +elif [ ! -d /cvmfs/software.eessi.io/versions/2023.06 ]; then + echo "Setting up the pilot repository, because the production repository (software.eessi.io) is not available on your system..." + echo "(see https://www.eessi.io/docs/getting_access/is_eessi_accessible/ for more information)" + source /cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/bash.force +else + echo "Automatically switching to version 2023.06 of the production repository (software.eessi.io)..." + source /cvmfs/software.eessi.io/versions/2023.06/init/bash +fi diff --git a/versions/2023.06/init/print_deprecation_warning.sh b/versions/2023.06/init/print_deprecation_warning.sh new file mode 100755 index 0000000000..634327c594 --- /dev/null +++ b/versions/2023.06/init/print_deprecation_warning.sh @@ -0,0 +1,29 @@ +#!/bin/bash +function echo_yellow_stderr() { + echo -e "\e[33m${1}\e[0m" >&2 +} + +echo_yellow_stderr +echo_yellow_stderr "WARNING: the EESSI pilot repository is deprecated and no longer supported." +echo_yellow_stderr +echo_yellow_stderr "We strongly recommend to switch to the EESSI production repository (software.eessi.io)." +echo_yellow_stderr "See https://www.eessi.io/docs/repositories/software.eessi.io/ for more information." +echo_yellow_stderr +echo_yellow_stderr "You can find instructions for making the production repository available at:" +echo_yellow_stderr "https://www.eessi.io/docs/getting_access/is_eessi_accessible/" +echo_yellow_stderr +echo_yellow_stderr "If the production repository is available on your system, please run" +echo_yellow_stderr +echo_yellow_stderr " source /cvmfs/software.eessi.io/versions/2023.06/init/bash" +echo_yellow_stderr +echo_yellow_stderr "to prepare your environment for using the EESSI production repository." +echo_yellow_stderr +echo_yellow_stderr "See also https://eessi.github.io/docs/using_eessi/setting_up_environment." +echo_yellow_stderr +echo_yellow_stderr "If you have any questions or if you need any help, please open a support ticket:" +echo_yellow_stderr "https://www.eessi.io/docs/support" +echo_yellow_stderr +echo_yellow_stderr "This script will now try to automatically switch to the production repository," +echo_yellow_stderr "unless it's not available or if \$EESSI_FORCE_PILOT is set." +echo_yellow_stderr +echo_yellow_stderr