Clean up dev.eessi.io-specific code (assume it's doing a site installation) and improve tarball creation step for site installations - #295
Conversation
… to create_tarball.sh
…dev project name to the override
|
I've also removed the sort of hack where we appended This actually fixes another issue: EESSI-install-software.sh would run |
|
Changing dev.eessi.io builds to site installations is probably a small change now (mostly a matter of setting |
|
Okay, with https://github.com/EESSI/dev.eessi.io-scripts/pull/3 and this PR, dev.eessi.io builds should now make use of the site installation functionality. A lot of code has been cleaned up by removing the dev.eessi.io-specific cases, all of it should be handled by the code that was recently introduced for site installations. The main thing that I did have to add was the one line of code that removes any version suffix from the EESSI version, as that was done in the dev bot's build script (see https://github.com/EESSI/dev.eessi.io-scripts/pull/3). This is relevant for |
|
I'll try to run a bunch of test builds with the standard software.eessi.io bot, a dev bot, and a local site bot to test the different scenarios. |
|
Note: when this gets merged, we should update https://www.eessi.io/docs/adding_software/adding_development_software/. It's already outdated, but this PR also changes the directory structure for easystack files (again). |
dev.eessi.io for site installations and improve tarball creation step for site installations
dev.eessi.io for site installations and improve tarball creation step for site installationsdev.eessi.io-specific code (assume it's doing a site installation) and improve tarball creation step for site installations
This improves the workflow, in particular the tarball creation step, for site installations that are done in a subdir of a CVMFS repo, e.g. with
$EESSI_SITE_SOFTWARE_PREFIX=/cvmfs/my.repo.tld/eessi. Though builds with such a prefix already work fine, the tarball step is unable to find the installations.I've made the solution as generic as possible by introducing a variable
EESSI_VERSIONS_SUBPATHthat defines the relative path (from the root of the CVMFS repo) to the versions subdir. For standard builds (software.eessi.io) it's just set toversions, but for site installations it would become e.g.eessi/versionsby stripping the CVMFS repository from the path and appendingversions.This is also useful for dev.eessi.io, as these builds also already go into a project directory. The workflow introduced here is a first step towards removing all the if statements that check for
EESSI_DEV_PROJECTordev.eessi.io: ultimately, the dev repo can just do a site installation by settingEESSI_SITE_SOFTWARE_PREFIX=/cvmfs/dev.eessi.io/$EESSI_DEV_PROJECT, and all the logic of site installations would apply.