Improve support for building on top of EESSI as a site, leveraging upstream software-layer-scripts#239

Merged

bedroge merged 43 commits into

SURF-hpcv:improve_building_on_top_support

Jun 1, 2026

Commits on May 18, 2026

Make sure to also mount software.eessi.io when building on top
Caspar van Leeuwen
committed
Make sure that the correct installpath is used, based on the value of EESSI_SITE_SOFTWARE_PATH_PREFIX
Caspar van Leeuwen
committed

Commits on May 19, 2026

Add more verbosity to figure out what's wrong
Caspar van Leeuwen
committed
Fix typo
Caspar van Leeuwen
committed
Update verbosity to make it easier to find in the logs
Caspar van Leeuwen
committed
Fix verbosity
Caspar van Leeuwen
committed
Force an ls on the top level of the EESSI_CVMFS_REPO in order to avoid issues with the overlay filesystem not being able to write when doing mkdir calls
Caspar van Leeuwen
committed
Do the ls to trigger the automount after initializing the minimal EESSI env, as the EESSI_CVMFS_REPO doesn't seem to be set any earlier
Caspar van Leeuwen
committed
Remove stray whitespace
Caspar van Leeuwen
committed
Add verbosity on EASYBUILD_INSTALLPATH
Caspar van Leeuwen
committed

Commits on May 25, 2026

Make sure EESSI_SITE_INSTALL and EESSI_SITE_SOFTWARE_PREFIX are propagated into the compat layer environment
Caspar van Leeuwen
committed
Instead of EESSI_SITE_INSTALL, propagate EESSI_SITE_INSTALL_FORCE. This is the custom variable we introduced for the sole purpose of forcing site installs for the build scripts. We introduced a sep…
Caspar van Leeuwen
committed
Be consistent in what we pass on...
Caspar van Leeuwen
committed
Add debugging output to see what the values of our env vars are and why they are not respected
Caspar van Leeuwen
committed
Fix variable name
Caspar van Leeuwen
committed
Now actually checking the right variable name in verbose output
Caspar van Leeuwen
committed
Add debugging output to see why loading the EESSI module doesn't seem to set the EESSI_SITE_SOFTWARE_PATH correctly
Caspar van Leeuwen
committed
Merge branch 'main' into improve_building_on_top_support
Caspar van Leeuwen
committed

Commits on May 26, 2026

Make all parts of EESSI-install-software conditional that should be skipped for site installations. Also, make sure that parts that should be installed in /cvmfs/software.eessi.io for site installa…
Caspar van Leeuwen
committed
Fix condition for reloading the EESSI and EESSI-extend module for site installs that define EESSI_SITE_SOFTWARE_PREFIX
Caspar van Leeuwen
committed
Make sure to store EESSI_VERSION so that we can restore it after the module purge
Caspar van Leeuwen
committed
Closing quotes
Caspar van Leeuwen
committed
Set these variables automatically when we're not building for software.eessi.io or dev.eessi.io
Caspar van Leeuwen
committed
Make sure to propagate the changes from bot/build.sh to bot/test.sh so that when we're doing site builds, we are _also_ mounting software.eessi.io _and_ we are using the software.eessi.io compatibi…
Caspar van Leeuwen
committed

Commits on May 27, 2026

Load EESSI via module
Caspar van Leeuwen
committed
Make sure an lmod command is available
Caspar van Leeuwen
committed
Trying to debug...
Caspar van Leeuwen
committed
Check that the target of LMOD_CMD also exists
Caspar van Leeuwen
committed
Now do the test the right way around...
Caspar van Leeuwen
committed
Also test for the existence of a regular EESSI_VERSION, as that is sufficient to set the override dir
Caspar van Leeuwen
committed
Also set the compat layer override when we know EESSI_VERSION instead of EESSI_VERSION_OVERRIDE - that's sufficient
Caspar van Leeuwen
committed
Add proper way to override compat layer dir in run_tests.sh
Caspar van Leeuwen
committed

Commits on May 28, 2026

Add debugging output
Caspar van Leeuwen
committed

Commits on May 29, 2026

Check for the site repo first
Caspar van Leeuwen
committed
add todo
Caspar van Leeuwen
committed
Make error clearer
Caspar van Leeuwen
committed
Add missing dollar-sign
Caspar van Leeuwen
committed

Commits on Jun 1, 2026

Apply suggestions from code review
casparvl
authored
For now, revert the test-step changes. It doesn't work yet, and we'd like to merge the build-step changes
Caspar van Leeuwen
committed
Apply suggestions from code review

casparvl
and
bedroge
authored
Check for EESSI_CVMFS_REPO_OVERRIDE for site specific installs
Caspar van Leeuwen
committed
Fixed wrong naming
Caspar van Leeuwen
committed
Add missing fi and fix indent
Caspar van Leeuwen
committed