diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml
index abade73d27..6dfd78e428 100644
--- a/.github/workflows/test_eessi.yml
+++ b/.github/workflows/test_eessi.yml
@@ -20,18 +20,6 @@ jobs:
- x86_64/intel/haswell
- x86_64/intel/skylake_avx512
- x86_64/generic
- EASYSTACK_FILE:
- - eessi-2023.06-eb-4.7.2-2021a.yml
- - eessi-2023.06-eb-4.7.2-2021b.yml
- - 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
- - eessi-2023.06-eb-4.8.1-2022a.yml
steps:
- name: Check out software-layer repository
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
@@ -53,7 +41,12 @@ jobs:
export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
env | grep ^EESSI | sort
echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)"
- ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}}
+ for easystack_file in $(ls eessi-${{matrix.EESSI_VERSION}}-eb-*.yml); do
+ echo "check missing installations for ${easystack_file}..."
+ ./check_missing_installations.sh ${easystack_file}
+ ec=$?
+ if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
+ done
- name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
run: |
@@ -64,15 +57,18 @@ jobs:
export EESSI_OS_TYPE=linux
export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
env | grep ^EESSI | sort
- echo "modify easystack file by adding a missing package (GCC/8.3.0)"
- echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}}
- tail -n 5 ${{matrix.EASYSTACK_FILE}}
+ # create dummy easystack file with a single entry (something that is not installed in EESSI)
+ easystack_file="test.yml"
+ echo "easyconfigs:" > ${easystack_file}
+ echo " - GCC-8.3.0:" >> ${easystack_file}
+ echo "created easystack file '${easystack_file}' with a missing installation (GCC/8.3.0):"
+ cat ${easystack_file}
# note, check_missing_installations.sh exits 1 if a package was
# missing, which is intepreted as false (exit code based, not
# boolean logic), hence when the script exits 0 if no package was
# missing it is interpreted as true, thus the test did not capture
# the missing package
- if ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}}; then
+ if ./check_missing_installations.sh ${easystack_file}; then
echo "did NOT capture missing package; test FAILED"
exit 1
else
diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index ed5319a6db..c6c51e7abc 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -41,7 +41,7 @@ function copy_build_log() {
echo "- working directory: ${PWD}" >> ${build_log_path}
echo "- Slurm job ID: ${SLURM_OUT}" >> ${build_log_path}
echo "- EasyBuild version: ${eb_version}" >> ${build_log_path}
- echo "- easystack file: ${es}" >> ${build_log_path}
+ echo "- easystack file: ${easystack_file}" >> ${build_log_path}
echo "EasyBuild log file ${build_log} copied to ${build_log_path} (with context appended)"
fi
@@ -186,36 +186,42 @@ else
echo_green ">> MODULEPATH set up: ${MODULEPATH}"
fi
-for eb_version in '4.7.2' '4.8.0' '4.8.1'; do
+# assume there's only one diff file that corresponds to the PR patch file
+pr_diff=$(ls [0-9]*.diff | head -1)
+
+# use PR patch file to determine in which easystack files stuff was added
+for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^eessi.*yml$'); do
+
+ echo -e "Processing easystack file ${easystack_file}...\n\n"
+
+ # determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file
+ eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*/\1/g')
# load EasyBuild module (will be installed if it's not available yet)
source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..."
- for es in $(ls eessi-${EESSI_PILOT_VERSION}-eb-${eb_version}-*.yml); do
-
- if [ -f ${es} ]; then
- echo_green "Feeding easystack file ${es} to EasyBuild..."
+ if [ -f ${easystack_file} ]; then
+ echo_green "Feeding easystack file ${easystack_file} to EasyBuild..."
- ${EB} --easystack ${TOPDIR}/${es} --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)
- # copy to current working directory
- cp -a ${eb_last_log} .
- echo "Last EasyBuild log file copied from ${eb_last_log} to ${PWD}"
- # copy to build logs dir (with context added)
- copy_build_log "${eb_last_log}" "${build_logs_dir}"
- fi
-
- $TOPDIR/check_missing_installations.sh ${TOPDIR}/${es}
- else
- fatal_error "Easystack file ${es} not found!"
+ # copy EasyBuild log file if EasyBuild exited with an error
+ if [ ${ec} -ne 0 ]; then
+ eb_last_log=$(unset EB_VERBOSE; eb --last-log)
+ # copy to current working directory
+ cp -a ${eb_last_log} .
+ echo "Last EasyBuild log file copied from ${eb_last_log} to ${PWD}"
+ # copy to build logs dir (with context added)
+ copy_build_log "${eb_last_log}" "${build_logs_dir}"
fi
- done
+
+ $TOPDIR/check_missing_installations.sh ${TOPDIR}/${easystack_file}
+ else
+ fatal_error "Easystack file ${easystack_file} not found!"
+ fi
done
diff --git a/bot/bot-eessi-aws-citc.cfg b/bot/bot-eessi-aws-citc.cfg
deleted file mode 100644
index a5e53d82c1..0000000000
--- a/bot/bot-eessi-aws-citc.cfg
+++ /dev/null
@@ -1,238 +0,0 @@
-# Also see documentation at https://github.com/EESSI/eessi-bot-software-layer/blob/main/README.md#step5.5
-
-[github]
-# replace '123456' with the ID of your GitHub App
-app_id = 281041
-
-# a short (!) name for your app instance that can be used for example
-# when adding/updating a comment to a PR
-# (!) a short yet descriptive name is preferred because it appears in
-# comments to the PR
-# for example, the name could include the name of the cluster the bot
-# runs on and the username which runs the bot
-# NOTE avoid putting an actual username here as it will be visible on
-# potentially publicly accessible GitHub pages.
-app_name = eessi-bot-citc-aws
-
-# replace '12345678' with the ID of the installation of your GitHub App
-# (can be derived by creating an event and then checking for the list
-# of sent events and its payload either via the Smee channel's web page
-# or via the Advanced section of your GitHub App on github.com)
-installation_id = 33078935
-
-# path to the private key that was generated when the GitHub App was registered
-private_key = /mnt/shared/home/bot/eessi-bot-software-layer/eessi-bot-citc-aws.2023-01-12.private-key.pem
-
-
-[bot_control]
-# which GH accounts have the permission to send commands to the bot
-# if value is left/empty everyone can send commands
-# value can be a space delimited list of GH accounts
-command_permission = boegel trz42 bedroge laraPPr ocaisa casparvl satishskamath maxim-masterov TopRichard xinan1911
-
-# format of the response when processing bot commands
-command_response_fmt =
- Updates by the bot instance {app_name}
- (click for details)
-
- {comment_response}
- {comment_result}
- :shrug: UNKNOWN _(click triangle for detailed information)_
- Job results file `{filename}` does not exist in job directory or reading it failed.
- No artefacts were found/reported.