From 633de6a2349286a604ec85ecf51af30e4446e9b2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 16 Jun 2023 17:49:23 +0200 Subject: [PATCH 1/4] bump EESSI pilot version to 2023.06 + update create_directory_tarballs.sh script to use '2023.06' branch of EESSI/software-layer repo --- create_directory_tarballs.sh | 2 +- init/eessi_defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/create_directory_tarballs.sh b/create_directory_tarballs.sh index 70e666f871..4465465082 100755 --- a/create_directory_tarballs.sh +++ b/create_directory_tarballs.sh @@ -1,6 +1,6 @@ #!/bin/bash -SOFTWARE_LAYER_TARBALL_URL=https://github.com/EESSI/software-layer/tarball/main +SOFTWARE_LAYER_TARBALL_URL=https://github.com/EESSI/software-layer/tarball/2023.06 set -eo pipefail diff --git a/init/eessi_defaults b/init/eessi_defaults index f482cbc269..0143dc38ab 100644 --- a/init/eessi_defaults +++ b/init/eessi_defaults @@ -9,4 +9,4 @@ # export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/pilot.eessi-hpc.org}" -export EESSI_PILOT_VERSION="${EESSI_PILOT_VERSION_OVERRIDE:=2021.12}" +export EESSI_PILOT_VERSION="${EESSI_PILOT_VERSION_OVERRIDE:=2023.06}" From ddbaaab7c3386b20656c6d27e0ad654f0d217554 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 16 Jun 2023 17:57:18 +0200 Subject: [PATCH 2/4] also run tests for README and scripts for non-main branches --- .github/workflows/tests_readme.yml | 2 -- .github/workflows/tests_scripts.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/tests_readme.yml b/.github/workflows/tests_readme.yml index 5c6d0318d4..ac906125ab 100644 --- a/.github/workflows/tests_readme.yml +++ b/.github/workflows/tests_readme.yml @@ -7,8 +7,6 @@ on: - init/eessi_defaults pull_request: - branches: - - main paths: - README.md - init/eessi_defaults diff --git a/.github/workflows/tests_scripts.yml b/.github/workflows/tests_scripts.yml index 5c0b3893ae..81a3633b72 100644 --- a/.github/workflows/tests_scripts.yml +++ b/.github/workflows/tests_scripts.yml @@ -13,8 +13,6 @@ on: - update_lmod_cache.sh pull_request: - branches: - - main paths: - build_container.sh - create_directory_tarballs.sh From 60d60a34070f6bf892e8f3451c9078a3c7ed59ee Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 16 Jun 2023 17:58:29 +0200 Subject: [PATCH 3/4] update README for 2023.06 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index daf02eebc2..e24de45b0e 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ See also https://eessi.github.io/docs/software_layer. You can set up your environment by sourcing the init script: ``` -$ source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash -Found EESSI pilot repo @ /cvmfs/pilot.eessi-hpc.org/versions/2021.12! +$ source /cvmfs/pilot.eessi-hpc.org/versions/2023.06/init/bash +Found EESSI pilot repo @ /cvmfs/pilot.eessi-hpc.org/versions/2023.06! Derived subdirectory for software layer: x86_64/intel/haswell Using x86_64/intel/haswell subdirectory for software layer (HARDCODED) Initializing Lmod... -Prepending /cvmfs/pilot.eessi-hpc.org/versions/2021.12/software/x86_64/intel/haswell/modules/all to $MODULEPATH... +Prepending /cvmfs/pilot.eessi-hpc.org/versions/2023.06/software/x86_64/intel/haswell/modules/all to $MODULEPATH... Environment set up to use EESSI pilot software stack, have fun! -[EESSI pilot 2021.12] $ +[EESSI pilot 2023.06] $ ``` ### Accessing EESSI via a container From 1013f88487006d0456c51bd264e5d4030e6d6358 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 21 Jun 2023 14:37:22 +0200 Subject: [PATCH 4/4] only test load_easybuild_module.sh script with EasyBuild v4.5.2 or newer --- .github/workflows/tests_scripts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests_scripts.yml b/.github/workflows/tests_scripts.yml index 81a3633b72..6ef9d57975 100644 --- a/.github/workflows/tests_scripts.yml +++ b/.github/workflows/tests_scripts.yml @@ -40,7 +40,9 @@ jobs: # bind current directory into container as /software-layer export SINGULARITY_BIND="${PWD}:/software-layer" - for EB_VERSION in '4.5.0' '4.5.1' '4.7.2'; do + # can't test with EasyBuild versions older than v4.5.2 when using EESSI pilot 2023.06, + # since Python in compat layer is Python 3.11.x + for EB_VERSION in '4.5.2' '4.6.0' '4.7.2'; do # Create script that uses load_easybuild_module.sh which we can run in compat layer environment # note: Be careful with single vs double quotes below! # ${EB_VERSION} should be expanded, so use double quotes;