From b959571a1e3136a779658e89dac1e3b0c1de8393 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Wed, 25 Oct 2023 11:28:58 +0200
Subject: [PATCH] remove some lua files from broadwell /cvmfs before building

---
 EESSI-pilot-install-software.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 7e775282fd..f9fc526669 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -200,10 +200,15 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[
 
     ${EB} --show-config
 
-    echo "################################################################################"
-    echo "#### SHOW ENV"
-    env | sort
-    echo "################################################################################"
+    echo "Removing some lua files to trigger rebuilding packages"
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/jbigkit/2.1-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/NASM/2.15.05-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libjpeg-turbo/2.1.3-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libdeflate/1.10-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/gzip/1.12-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/lz4/1.9.3-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/zstd/1.5.2-GCCcore-11.3.0.lua
+    rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/LibTIFF/4.3.0-GCCcore-11.3.0.lua
 
     echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..."
 
@@ -213,9 +218,6 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[
         ${EB} --easystack ${TOPDIR}/${easystack_file} --robot
         ec=$?
 
-        ${EB} --easystack ${TOPDIR}/${easystack_file} --robot
-        ec=$?
-
         # copy EasyBuild log file if EasyBuild exited with an error
         if [ ${ec} -ne 0 ]; then
             eb_last_log=$(unset EB_VERBOSE; eb --last-log)