Skip to content

Fix forgotten EESSI_ACCELERATOR_TARGET #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 9, 2025
Merged

Fix forgotten EESSI_ACCELERATOR_TARGET #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
107cdab
Change EESSI_TARGET_ACCELERATOR into EESSI_TARGET_ACCELERATOR_OVERRID…
Jul 9, 2025
b7d168d
Merge branch 'main' into fix_forgotten_accelerator_override
Jul 9, 2025
831305b
Conditionally add the accelerator path, only if it's non-empty
Jul 9, 2025
91696d1
Add easystack for testing
Jul 9, 2025
a84cfd8
Fix indentation
Jul 9, 2025
2d0cc68
Remove test easystack
Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ export EESSI_DEV_PROJECT=${EESSI_DEV_PROJECT}
TMP_IN_CONTAINER=/tmp
echo "Executing command to create tarball:"
echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}"
echo " -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
echo " -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDE}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
$software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \
-- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}
-- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDE}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}

exit 0
8 changes: 6 additions & 2 deletions create_tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,12 @@ if [ -d ${eessi_version}/init ]; then
find ${eessi_version}/init -type f \! -name '.wh.*' >> ${files_list}
fi

# consider both CPU-only and accelerator subdirectories
for subdir in ${cpu_arch_subdir} ${cpu_arch_subdir}/${accel_subdir}; do
# consider both CPU-only and accelerator subdirectories (if an accelerator was configured)
sw_subdirs=${cpu_arch_subdir}
if [ -n ${accel_subdir} ]; then
sw_subdirs="${sw_subdirs} ${cpu_arch_subdir}/${accel_subdir}"
fi
for subdir in ${sw_subdirs}; do

if [ -d ${eessi_version}/software/${os}/${subdir}/modules ]; then
# module files
Expand Down