Fix mistake

EESSI-install-software.sh

@@ -283,7 +283,6 @@ if command_exists "nvidia-smi"; then
     fi
 fi
 
-
 if [ ! -z "${shared_fs_path}" ]; then
     shared_eb_sourcepath=${shared_fs_path}/easybuild/sources
     echo ">> Using ${shared_eb_sourcepath} as shared EasyBuild source path"

EESSI-remove-software.sh

@@ -130,13 +130,13 @@ if [ $EUID -eq 0 ]; then
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
                     rm -rf ${app_dir}
                     rm -rf ${app_module}
-                    # recreate the installation directories and first-level subdirectories to work around permission denied
-                    # issues when rebuilding the package (see https://github.com/EESSI/software-layer/issues/556)
+                    # recreate the installation directory and do an ls on the first-level subdirectories to work around
+                    # permission issues when reinstalling the application (see https://github.com/EESSI/software-layer/issues/556)
                     echo_yellow "Recreating an empty ${app_dir}..."
                     mkdir -p ${app_dir}
-                    for app_subdir in ${app_subdirs}; do
-                        mkdir -p ${app_subdir}
-                    done
+                    # these subdirs don't (and shouldn't) exist, but we need to do the ls anyway as a workaround,
+                    # so redirect to /dev/null and ignore the exit code
+                    ls ${app_subdirs} >& /dev/null || true
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"

bot/build.sh

@@ -252,6 +252,7 @@ mkdir -p ${TARBALL_TMP_BUILD_STEP_DIR}
 # prepare arguments to eessi_container.sh specific to build step
 BUILD_STEP_ARGS+=("--save" "${TARBALL_TMP_BUILD_STEP_DIR}")
 BUILD_STEP_ARGS+=("--storage" "${STORAGE}")
+
 # add options required to handle NVIDIA support
 if command_exists "nvidia-smi"; then
     # Accept that this may fail

bot/test.sh

@@ -222,7 +222,7 @@ if command_exists "nvidia-smi"; then
     set -e
     if [ ${ec} -eq 0 ]; then
         echo "Command 'nvidia-smi' found, using available GPU"
-        BUILD_STEP_ARGS+=("--nvidia" "run")
+        TEST_STEP_ARGS+=("--nvidia" "run")
     else
         echo "Warning: command 'nvidia-smi' found, but 'nvidia-smi --version' did not run succesfully."
         echo "This script now assumes this is NOT a GPU node."

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml

@@ -45,3 +45,7 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22145
         from-commit: 31478e5c9869de3add74d0a02dd5df01ea65b21e
+  - archspec-0.2.5-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22235
+        from-commit: 01dd97ea62fe4d7d0df040ede3af03eb2f1b8641

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml

@@ -25,3 +25,15 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21915
         from-commit: 58f16c0caf8c5494c68e9eda8cbf19e9145d3cfa
+  - DP3-6.2-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
+  - WSClean-3.5-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
+  - EveryBeam-0.6.1-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23 

easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml

@@ -0,0 +1,16 @@
+# 2024.10.15
+# Generic build of LAMMPS have optimizations for the build host CPU,
+# this is fixed in https://github.com/easybuilders/easybuild-easyblocks/pull/3484
+easyconfigs:
+  - LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb:
+      options:
+        # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484
+        include-easyblocks-from-commit: 3671c5b7c238c7dc8aadd2c510329770ef1bdcdf
+  - LAMMPS-29Aug2024-foss-2023b-kokkos.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436
+        from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533
+        # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484
+        include-easyblocks-from-commit: 3671c5b7c238c7dc8aadd2c510329770ef1bdcdf
+
+

easystacks/software.eessi.io/2023.06/rebuilds/20250203-eb-4.9.4-LAMMPS-2Aug2023-add-support-for-sapphire_rapids.yml

@@ -0,0 +1,12 @@
+# 2025.02.03
+# Rebuild LAMMPS 2Aug2023_update2 for Sapphire Rapids,
+# as the existing version used an old version of archspec that detected the CPU as Icelake.
+# See https://github.com/easybuilders/easybuild-easyconfigs/pull/22235
+# and https://github.com/easybuilders/easybuild-easyblocks/pull/3569.
+easyconfigs:
+  - LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22235
+        from-commit: 01dd97ea62fe4d7d0df040ede3af03eb2f1b8641
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3569
+        include-easyblocks-from-commit: b0ce5ec66c8f797220b2c2a773acfc4aeae7a0c7