Merge branch '2023.06' into 2023.06_2021a_R-4.1.0

.github/workflows/test_eessi.yml

@@ -26,7 +26,11 @@ jobs:
         - eessi-2023.06-eb-4.7.2-2022a.yml
         - eessi-2023.06-eb-4.7.2-2022b.yml
         - eessi-2023.06-eb-4.7.2-system.yml
+        - eessi-2023.06-eb-4.8.0-2021a.yml
         - eessi-2023.06-eb-4.8.0-system.yml
+        - eessi-2023.06-eb-4.8.0-2021b.yml
+        - eessi-2023.06-eb-4.8.1-system.yml
+        - eessi-2023.06-eb-4.8.1-2021b.yml
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

EESSI-pilot-install-software.sh

@@ -8,10 +8,12 @@
 
 display_help() {
   echo "usage: $0 [OPTIONS]"
+  echo "  --build-logs-dir       -  location to copy EasyBuild logs to for failed builds"
   echo "  -g | --generic         -  instructs script to build for generic architecture target"
   echo "  -h | --help            -  display this usage information"
   echo "  -x | --http-proxy URL  -  provides URL for the environment variable http_proxy"
   echo "  -y | --https-proxy URL -  provides URL for the environment variable https_proxy"
+  echo "  --shared-fs-path       -  path to directory on shared filesystem that can be used"
 }
 
 function copy_build_log() {
@@ -70,6 +72,10 @@ while [[ $# -gt 0 ]]; do
       export build_logs_dir="${2}"
       shift 2
       ;;
+    --shared-fs-path)
+      export shared_fs_path="${2}"
+      shift 2
+      ;;
     -*|--*)
       echo "Error: Unknown option: $1" >&2
       exit 1
@@ -160,6 +166,14 @@ fi
 echo ">> Configuring EasyBuild..."
 source $TOPDIR/configure_easybuild
 
+if [ ! -z "${shared_fs_path}" ]; then
+    shared_eb_sourcepath=${shared_fs_path}/easybuild/sources
+    echo ">> Using ${shared_eb_sourcepath} as shared EasyBuild source path"
+    export EASYBUILD_SOURCEPATH=${shared_eb_sourcepath}:${EASYBUILD_SOURCEPATH}
+fi
+
+${EB} --show-config
+
 echo ">> Setting up \$MODULEPATH..."
 # make sure no modules are loaded
 module --force purge
@@ -172,7 +186,7 @@ else
     echo_green ">> MODULEPATH set up: ${MODULEPATH}"
 fi
 
-for eb_version in '4.7.2' '4.8.0'; do
+for eb_version in '4.7.2' '4.8.0' '4.8.1'; do
 
     # load EasyBuild module (will be installed if it's not available yet)
     source ${TOPDIR}/load_easybuild_module.sh ${eb_version}

bot/bot-eessi-aws-citc.cfg

@@ -44,6 +44,10 @@ command_response_fmt =
 # name of the job script used for building an EESSI stack
 build_job_script = /mnt/shared/home/bot/eessi-bot-software-layer/scripts/bot-build.slurm
 
+# path to directory on shared filesystem that can be used for sharing data across build jobs
+# (for example source tarballs used by EasyBuild)
+shared_fs_path = /mnt/shared/home/bot/shared
+
 # Path (directory) to which build logs for (only) failing builds should be copied by bot/build.sh script
 build_logs_dir = /mnt/shared/bot-build-logs
 

bot/build.sh

@@ -64,6 +64,18 @@ else
     export SINGULARITY_BIND="${SINGULARITY_BIND},${BUILD_LOGS_DIR}"
 fi
 
+# check if path to directory on shared filesystem is specified,
+# and use it as location for source tarballs used by EasyBuild if so
+SHARED_FS_PATH=$(cfg_get_value "site_config" "shared_fs_path")
+echo "bot/build.sh: SHARED_FS_PATH='${SHARED_FS_PATH}'"
+# if $SHARED_FS_PATH is set, add it to $SINGULARITY_BIND so the path is available in the build container
+mkdir -p ${SHARED_FS_PATH}
+if [[ -z ${SINGULARITY_BIND} ]]; then
+    export SINGULARITY_BIND="${SHARED_FS_PATH}"
+else
+    export SINGULARITY_BIND="${SINGULARITY_BIND},${SHARED_FS_PATH}"
+fi
+
 SINGULARITY_CACHEDIR=$(cfg_get_value "site_config" "container_cachedir")
 echo "bot/build.sh: SINGULARITY_CACHEDIR='${SINGULARITY_CACHEDIR}'"
 if [[ ! -z ${SINGULARITY_CACHEDIR} ]]; then
@@ -167,6 +179,7 @@ if [[ ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} =~ .*/generic$ ]]; then
     INSTALL_SCRIPT_ARGS+=("--generic")
 fi
 [[ ! -z ${BUILD_LOGS_DIR} ]] && INSTALL_SCRIPT_ARGS+=("--build-logs-dir" "${BUILD_LOGS_DIR}")
+[[ ! -z ${SHARED_FS_PATH} ]] && INSTALL_SCRIPT_ARGS+=("--shared-fs-path" "${SHARED_FS_PATH}")
 
 # create tmp file for output of build step
 build_outerr=$(mktemp build.outerr.XXXX)

eessi-2023.06-eb-4.8.0-2021a.yml

@@ -0,0 +1,2 @@
+easyconfigs:
+  - GDAL-3.3.0-foss-2021a.eb

eessi-2023.06-eb-4.8.0-2021b.yml

@@ -0,0 +1,7 @@
+easyconfigs:
+  - MPFR-4.1.0-GCCcore-11.2.0.eb:
+      # use patch for MPFR 4.1.0 to fix failing tsprintf test with glibc >= 2.37,
+      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746
+      options:
+        from-pr: 18746
+  - OpenFOAM-v2112-foss-2021b.eb

eessi-2023.06-eb-4.8.0-system.yml

@@ -5,3 +5,6 @@ easyconfigs:
       # + https://github.com/easybuilders/easybuild-easyblocks/pull/2995
       options:
         include-easyblocks-from-pr: 2995
+  - EasyBuild-4.8.1.eb:
+      options:
+        from-pr: 18761

eessi-2023.06-eb-4.8.1-2021b.yml

@@ -0,0 +1,7 @@
+easyconfigs:
+  - Xvfb-1.20.13-GCCcore-11.2.0.eb:
+      # enable exec permissions for xvfb-run after copying;
+      # need to also enable user write permissions on xvfb-run to ensure that copying with preserved permissions works
+      options:
+        from-pr: 18834
+  - R-4.2.0-foss-2021b.eb

eessi-2023.06-eb-4.8.1-system.yml

@@ -0,0 +1,6 @@
+easyconfigs:
+  # rebuilt with EasyBuild v4.8.1 (now wraps around Java/11.0.20)
+  - Java-11.eb
+  - ReFrame-4.3.3.eb:
+      options:
+        from-pr: 18851