From dc60643b8885261d173d1618593da7b2c5c02730 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 7 Oct 2022 20:12:07 +0200 Subject: [PATCH 1/4] add CaDiCaL v1.3.0 with GCC/9.3.0 --- EESSI-pilot-install-software.sh | 7 +++++++ eessi-2021.12.yml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 7312818a2c..b7cd3c901a 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -352,6 +352,13 @@ check_exit_code $? "${ok_msg}" "${fail_msg}" ### add packages here +export CaDiCaL_EC="CaDiCaL-1.3.0-GCC-9.3.0.eb" +echo ">> Installing ${CaDiCaL_EC}..." +ok_msg="${CaDiCaL_EC} installed, let's solve some problems!" +fail_msg="Installation of ${CaDiCaL_EC} failed, that's a pity..." +$EB ${CaDiCaL_EC} --robot +check_exit_code $? "${ok_msg}" "${fail_msg}" + echo ">> Creating/updating Lmod cache..." export LMOD_RC="${EASYBUILD_INSTALLPATH}/.lmod/lmodrc.lua" if [ ! -f $LMOD_RC ]; then diff --git a/eessi-2021.12.yml b/eessi-2021.12.yml index f3ed9dd9c4..dd68e348ee 100644 --- a/eessi-2021.12.yml +++ b/eessi-2021.12.yml @@ -53,3 +53,7 @@ software: versions: '3.9.1.1': versionsuffix: -dmpar + CaDiCaL: + toolchains: + GCC-9.3.0: + versions: ['1.3.0'] From c376071626d348dd751372a57a2f176823889f8c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 20 Jun 2023 12:02:32 +0200 Subject: [PATCH 2/4] 2021.12 --- init/eessi_defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/eessi_defaults b/init/eessi_defaults index 0143dc38ab..f482cbc269 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:=2023.06}" +export EESSI_PILOT_VERSION="${EESSI_PILOT_VERSION_OVERRIDE:=2021.12}" From 29b43222377fa3b5040b36d97608b59965d6132f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 20 Jun 2023 13:50:37 +0200 Subject: [PATCH 3/4] make sure that $job_out is defined in bot/check-result.sh --- bot/check-result.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bot/check-result.sh b/bot/check-result.sh index 51e1777bab..182b8555a8 100755 --- a/bot/check-result.sh +++ b/bot/check-result.sh @@ -95,14 +95,14 @@ job_dir=${PWD} [[ ${VERBOSE} -ne 0 ]] && echo ">> analysing job in directory ${job_dir}" -GP_slurm_out="slurm-${SLURM_JOB_ID}.out" -[[ ${VERBOSE} -ne 0 ]] && echo ">> searching for job output file(s) matching '"${GP_slurm_out}"'" -if [[ -f ${GP_slurm_out} ]]; then +job_out="slurm-${SLURM_JOB_ID}.out" +[[ ${VERBOSE} -ne 0 ]] && echo ">> searching for job output file(s) matching '"${job_out}"'" +if [[ -f ${job_out} ]]; then SLURM=1 - [[ ${VERBOSE} -ne 0 ]] && echo " found slurm output file '"${GP_slurm_out}"'" + [[ ${VERBOSE} -ne 0 ]] && echo " found slurm output file '"${job_out}"'" else SLURM=0 - [[ ${VERBOSE} -ne 0 ]] && echo " Slurm output file '"${GP_slurm_out}"' NOT found" + [[ ${VERBOSE} -ne 0 ]] && echo " Slurm output file '"${job_out}"' NOT found" fi ERROR=-1 @@ -339,7 +339,7 @@ comment_summary="${comment_summary_fmt/__SUMMARY__/${summary}}" CoDeList="" success_msg="job output file ${job_out}" -failure_msg="no job output file matching ${GP_slurm_out}" +failure_msg="no job output file ${job_out}" CoDeList=${CoDeList}$(add_detail ${SLURM} 1 "${success_msg}" "${failure_msg}") success_msg="no message matching ${GP_error}" From 088db4def55346298958c2f5707936928eb9836c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 20 Jun 2023 19:38:46 +0200 Subject: [PATCH 4/4] fix usage of check_missing_installations.sh --- EESSI-pilot-install-software.sh | 2 +- check_missing_installations.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 5208eb9f9f..de6d77229f 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -385,7 +385,7 @@ fi $TOPDIR/update_lmod_cache.sh ${EPREFIX} ${EASYBUILD_INSTALLPATH} -$TOPDIR/check_missing_installations.sh +$TOPDIR/check_missing_installations.sh $TOPDIR/eessi-2021.12.yml echo ">> Cleaning up ${TMPDIR}..." rm -r ${TMPDIR} diff --git a/check_missing_installations.sh b/check_missing_installations.sh index 3627d1d0b5..5fc59b7dc6 100755 --- a/check_missing_installations.sh +++ b/check_missing_installations.sh @@ -24,7 +24,7 @@ source $TOPDIR/configure_easybuild echo ">> Checking for missing installations in ${EASYBUILD_INSTALLPATH}..." eb_missing_out=$LOCAL_TMPDIR/eb_missing.out -${EB:-eb} --easystack ${easystack} --missing 2>&1 | tee ${eb_missing_out} +${EB:-eb} --from-pr 16531 --easystack ${easystack} --missing 2>&1 | tee ${eb_missing_out} exit_code=${PIPESTATUS[0]} ok_msg="Command 'eb --missing ...' succeeded, analysing output..."