Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/ci_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ jobs:
--test eb_robot_paths \
--test easyblock_layers \
--test easyblock_owed \
--test eessi_extend_eb_script \
--test extension_provides \
--test family_site_layer \
--test fetch_prs_script \
Expand Down
1 change: 1 addition & 0 deletions changelog.d/+cargo-prelude-eprefix.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A step of the Cargo prelude that fails stops EasyBuild's install command again: the host triple is read inside the prelude's `&&` chain, not after `_triple="";`, whose semicolon ended the chain. A missing or failing `rustc` still leaves the triple empty, even under `pipefail`.
1 change: 1 addition & 0 deletions changelog.d/+cargo-prelude-quoting.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The cargo-on-EESSI prelude quotes `CC` and `LIBRARY_PATH`. `CC='gcc; echo pwned'` is stored as the linker, and it is not run.
1 change: 1 addition & 0 deletions changelog.d/+doctor-eessi-extend.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`target doctor` passes the EasyBuild probe of a target with `EB_LOCAL_EESSI_EXTEND` on only when `--version` prints `This is EasyBuild`. eb-local 2.4.0 has no extend mode, answered `--version` itself and passed; the failed check now carries a `reason`.
1 change: 1 addition & 0 deletions changelog.d/+eb-local-extend-version.doc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The EESSI target in `docs/orgmode/reference/targets.org` and `examples/targets/eessi-extend.toml` needs eb-local 2.5.0 or later, the first release with `EB_LOCAL_EESSI_EXTEND`.
1 change: 1 addition & 0 deletions changelog.d/+use-eb-local-eessi.removal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The EESSI target runs `eb-local` with `EB_LOCAL_EESSI_EXTEND=1` instead of `scripts/eessi-extend-eb.sh`, and the script is removed. eb-stack does not build eb-local; the container bind-mounts the binary the operator installed. A present empty `EESSI_*_INSTALL` still counts as that mode, which `eb-local` enforces. With no `EESSI_*_INSTALL` set, installs move from the script's `$HOME/EESSI` to EESSI-extend's own `$HOME/eessi`; set `EESSI_USER_INSTALL` in `[targets.easybuild.environment]` to keep the old prefix.
2 changes: 1 addition & 1 deletion docs/orgmode/howto/eon-eessi-extend.org
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ the dependencies installed, a rebuild of eOn alone takes about 2.5 minutes.

* Build eOn with the robot

~scripts/eessi-extend-eb.sh~ sources EESSI's init, loads ~EESSI-extend~,
~eb-local eb~ sources EESSI's init, loads ~EESSI-extend~,
isolates Cargo from host wrappers, and execs ~eb~. On this checkout the
build runs through the local Podman target, which invokes ~eb --robot~
on the planned eOn bundle. The bundle path has to sit under
Expand Down
6 changes: 4 additions & 2 deletions docs/orgmode/howto/pypi-extend.org
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ a residual, not a silent SAT edge. A PEP 518 ~build_system~
block with ~build-backend = mesonpy~ adds the listed build requirements
and emits ~wrap_mode=default~ plus the same cargo-on-EESSI isolation
prelude used by Cargo leftovers: drop host rustc wrappers, set
~LINKER=${CC:-gcc}~, put the EESSI compat ~ld~ on ~PATH~, and point
~LINKER="$CC"~ (an empty ~CC~ becomes ~gcc~, and the value is not
evaluated), put the EESSI compat ~ld~ on ~PATH~, and point
~RUSTFLAGS -B~ at that ~ld~. The cargo target triple and compat arch
come from the build host (~rustc -vV~, ~uname -m~), not from a
plan-time x86_64 literal. Hatchling and ~meson-python~ already on
Expand Down Expand Up @@ -173,7 +174,8 @@ eb-stack campaign run \

~examples/targets/eessi-extend.toml~ is the target whose runtime command
is ~eessi_container.sh~. The local target above is the one this checkout
runs. ~scripts/eessi-extend-eb.sh~ is the wrapper that target execs.
runs. That EESSI target execs ~eb-local~ with ~EB_LOCAL_EESSI_EXTEND=1~,
which loads ~EESSI-extend~ and execs ~eb~.

User one-offs stay as ~python -m venv --system-site-packages~ on EESSI
Python. This workflow is for a shared site or project extra.
8 changes: 6 additions & 2 deletions docs/orgmode/reference/cli.org
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ it. Do not hand-edit the emitted recipe for those names. A PEP 518
~build_system~ object with ~build-backend = mesonpy~ is the mesonpy hint:
listed ~requires~ become build deps in the Boolean satisfiability (SAT) solve, and the emitter writes
~wrap_mode=default~ plus the shared cargo-on-EESSI isolation prelude
(host wrappers off, ~LINKER=${CC:-gcc}~, compat ~ld~ from ~uname -m~).
(host wrappers off, ~LINKER="$CC"~ after an empty ~CC~ becomes ~gcc~,
compat ~ld~ from ~uname -m~). ~CC~ and ~LIBRARY_PATH~ stay quoted, so a
value in either is not run as shell.
Hatchling stays a ~Python-bundle-PyPI~ module when the robot provides
it. See [[file:../howto/pypi-extend.org][site Python extras]].

Expand Down Expand Up @@ -1926,7 +1928,9 @@ Target layers are applied in argument order. A complete target contains:
environment.

~target doctor~ probes each layer separately and reports the exact routed
command, exit code, stdout, and stderr.
command, exit code, stdout, and stderr, and a ~reason~ when a probe that
exited 0 still failed. With ~EB_LOCAL_EESSI_EXTEND~ on, the EasyBuild probe
passes only when ~--version~ prints ~This is EasyBuild~.

See [[file:targets.org][build target configuration]] for complete layer schemas,
replacement semantics, ABI isolation, and the runnable local Podman target.
Expand Down
16 changes: 12 additions & 4 deletions docs/orgmode/reference/targets.org
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ eb-stack target doctor \

~target doctor~ independently executes transport, executor, runtime, and
EasyBuild probes. A reachable SSH host is not enough; all four checks must
succeed.
succeed. When ~[targets.easybuild.environment]~ turns on
~EB_LOCAL_EESSI_EXTEND~ (set, not empty, not ~0~), exit 0 is not enough
either: ~--version~ must print EasyBuild's ~This is EasyBuild~ line. An
eb-local without extend mode answers ~--version~ itself, and the check then
fails with a ~reason~.

* Transport

Expand Down Expand Up @@ -73,11 +77,15 @@ The ~eessi~ runtime is the install backend for site/user/project overlays.
It launches ~eessi_container.sh --mode exec~, fuse-mounts CernVM File System (CVMFS) inside the
image, and does not use the host CVMFS client. Plan ~package plan --format pypi|cran~
on the host: the host ~eb-stack~ binary need not run in the
Debian 12 image. ~scripts/eessi-extend-eb.sh~ sources the European Environment for Scientific Software Installations (EESSI) init script, loads
~EESSI-extend~, and execs ~eb~. See ~examples/targets/eessi-extend.toml~.
Debian 12 image. The EasyBuild command is ~eb-local~ with
~EB_LOCAL_EESSI_EXTEND=1~: that sources the European Environment for Scientific Software Installations (EESSI) init script, loads
~EESSI-extend~, and execs ~eb~. Bind the ~eb-local~ binary into the container;
eb-stack does not build it. That mode needs eb-local 2.5.0 or later: 2.4.0
and older ignore ~EB_LOCAL_EESSI_EXTEND~ and answer ~--version~ themselves,
and ~target doctor~ fails the target. See ~examples/targets/eessi-extend.toml~.
Set exactly one of ~EESSI_USER_INSTALL~, ~EESSI_PROJECT_INSTALL~,
~EESSI_SITE_INSTALL~, or ~EESSI_CVMFS_INSTALL~ in
~[targets.easybuild.environment]~.
~[targets.easybuild.environment]~. A present empty value counts as set.

Compiled modules, build trees, and temporary files belong to one runtime ABI.
Do not reuse a host or different-image install prefix inside a container.
Expand Down
17 changes: 13 additions & 4 deletions examples/targets/eessi-extend.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@ schema_version = 1
# Plan on the host (`package plan --format pypi|cran`). This target is the
# install backend: the host eb-stack binary does not need to run in Debian 12.
#
# Set exactly one prefix before campaign run, via environment here:
# Set exactly one prefix before campaign run, via environment here.
# A present empty value counts as set, as it does for EESSI-extend:
# EESSI_USER_INSTALL (default below)
# EESSI_PROJECT_INSTALL
# EESSI_SITE_INSTALL=1 plus EESSI_SITE_SOFTWARE_PREFIX in the site layer
# EESSI_CVMFS_INSTALL
#
# Bind the planned bundle and this install prefix into the container.
# Bind eb-local, the planned bundle and this install prefix into the
# container. eb-stack does not build eb-local; the operator installs it.
# EB_LOCAL_EESSI_EXTEND=1 makes that one program load EESSI-extend and
# exec eb, because a target command is a single executable. That mode
# needs eb-local 2.5.0 or later. 2.4.0 and older ignore the variable and
# answer --version themselves, so `eb-stack target doctor` fails the
# target until eb-local is upgraded.

[[targets]]
name = "eessi-extend-user"
Expand All @@ -26,17 +34,18 @@ command = "eessi_container.sh"
storage = "/tmp/eb-stack-eessi/storage"
access = "ro"
extra_bind_paths = [
"scripts/eessi-extend-eb.sh:/usr/local/bin/eessi-extend-eb.sh:ro",
"/usr/local/bin/eb-local:/usr/local/bin/eb-local:ro",
"/tmp/eb-stack-eessi:/tmp/eb-stack-eessi:rw",
]

[targets.easybuild]
command = "/usr/local/bin/eessi-extend-eb.sh"
command = "/usr/local/bin/eb-local"
robot_paths = []
work_root = "/tmp/eb-stack-eessi/work"
tmp_root = "/tmp/eb-stack-eessi/tmp"

[targets.easybuild.environment]
EB_LOCAL_EESSI_EXTEND = "1"
EESSI_VERSION = "2026.06"
EESSI_USER_INSTALL = "/tmp/eb-stack-eessi/install"
WORKING_DIR = "/tmp"
Expand Down
32 changes: 23 additions & 9 deletions llms-full.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1288,7 +1288,8 @@ a residual, not a silent SAT edge. A PEP 518 `build_system`
block with `build-backend = mesonpy` adds the listed build requirements
and emits `wrap_mode=default` plus the same cargo-on-EESSI isolation
prelude used by Cargo leftovers: drop host rustc wrappers, set
`LINKER=${CC:-gcc}`, put the EESSI compat `ld` on `PATH`, and point
`LINKER="$CC"` (an empty `CC` becomes `gcc`, and the value is not
evaluated), put the EESSI compat `ld` on `PATH`, and point
`RUSTFLAGS -B` at that `ld`. The cargo target triple and compat arch
come from the build host (`rustc -vV`, `uname -m`), not from a
plan-time x86_64 literal. Hatchling and `meson-python` already on
Expand Down Expand Up @@ -1337,7 +1338,8 @@ eb-stack campaign run \

`examples/targets/eessi-extend.toml` is the target whose runtime command
is `eessi_container.sh`. The local target above is the one this checkout
runs. `scripts/eessi-extend-eb.sh` is the wrapper that target execs.
runs. That EESSI target execs `eb-local` with `EB_LOCAL_EESSI_EXTEND=1`,
which loads `EESSI-extend` and execs `eb`.

User one-offs stay as `python -m venv --system-site-packages` on EESSI
Python. This workflow is for a shared site or project extra.
Expand Down Expand Up @@ -1566,7 +1568,7 @@ the dependencies installed, a rebuild of eOn alone takes about 2.5 minutes.

# Build eOn with the robot

`scripts/eessi-extend-eb.sh` sources EESSI's init, loads `EESSI-extend`,
`eb-local eb` sources EESSI's init, loads `EESSI-extend`,
isolates Cargo from host wrappers, and execs `eb`. On this checkout the
build runs through the local Podman target, which invokes `eb --robot`
on the planned eOn bundle. The bundle path has to sit under
Expand Down Expand Up @@ -6885,7 +6887,9 @@ it. Do not hand-edit the emitted recipe for those names. A PEP 518
`build_system` object with `build-backend = mesonpy` is the mesonpy hint:
listed `requires` become build deps in the Boolean satisfiability (SAT) solve, and the emitter writes
`wrap_mode=default` plus the shared cargo-on-EESSI isolation prelude
(host wrappers off, `LINKER=${CC:-gcc}`, compat `ld` from `uname -m`).
(host wrappers off, `LINKER="$CC"` after an empty `CC` becomes `gcc`,
compat `ld` from `uname -m`). `CC` and `LIBRARY_PATH` stay quoted, so a
value in either is not run as shell.
Hatchling stays a `Python-bundle-PyPI` module when the robot provides
it. See [site Python extras](https://eb-stack.rgoswami.me/../howto/pypi-extend.html.md).

Expand Down Expand Up @@ -8629,7 +8633,9 @@ Target layers are applied in argument order. A complete target contains:
environment.

`target doctor` probes each layer separately and reports the exact routed
command, exit code, stdout, and stderr.
command, exit code, stdout, and stderr, and a `reason` when a probe that
exited 0 still failed. With `EB_LOCAL_EESSI_EXTEND` on, the EasyBuild probe
passes only when `--version` prints `This is EasyBuild`.

See [build target configuration](https://eb-stack.rgoswami.me/targets.html.md) for complete layer schemas,
replacement semantics, ABI isolation, and the runnable local Podman target.
Expand Down Expand Up @@ -9854,7 +9860,11 @@ eb-stack target doctor \

`target doctor` independently executes transport, executor, runtime, and
EasyBuild probes. A reachable SSH host is not enough; all four checks must
succeed.
succeed. When `[targets.easybuild.environment]` turns on
`EB_LOCAL_EESSI_EXTEND` (set, not empty, not `0`), exit 0 is not enough
either: `--version` must print EasyBuild's `This is EasyBuild` line. An
eb-local without extend mode answers `--version` itself, and the check then
fails with a `reason`.

# Transport

Expand Down Expand Up @@ -9896,11 +9906,15 @@ The `eessi` runtime is the install backend for site/user/project overlays.
It launches `eessi_container.sh --mode exec`, fuse-mounts CernVM File System (CVMFS) inside the
image, and does not use the host CVMFS client. Plan `package plan --format pypi|cran`
on the host: the host `eb-stack` binary need not run in the
Debian 12 image. `scripts/eessi-extend-eb.sh` sources the European Environment for Scientific Software Installations (EESSI) init script, loads
`EESSI-extend`, and execs `eb`. See `examples/targets/eessi-extend.toml`.
Debian 12 image. The EasyBuild command is `eb-local` with
`EB_LOCAL_EESSI_EXTEND=1`: that sources the European Environment for Scientific Software Installations (EESSI) init script, loads
`EESSI-extend`, and execs `eb`. Bind the `eb-local` binary into the container;
eb-stack does not build it. That mode needs eb-local 2.5.0 or later: 2.4.0
and older ignore `EB_LOCAL_EESSI_EXTEND` and answer `--version` themselves,
and `target doctor` fails the target. See `examples/targets/eessi-extend.toml`.
Set exactly one of `EESSI_USER_INSTALL`, `EESSI_PROJECT_INSTALL`,
`EESSI_SITE_INSTALL`, or `EESSI_CVMFS_INSTALL` in
`[targets.easybuild.environment]`.
`[targets.easybuild.environment]`. A present empty value counts as set.

Compiled modules, build trees, and temporary files belong to one runtime ABI.
Do not reuse a host or different-image install prefix inside a container.
Expand Down
63 changes: 0 additions & 63 deletions scripts/eessi-extend-eb.sh

This file was deleted.

4 changes: 2 additions & 2 deletions skills/eessi-extend/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ eb-stack campaign run \
--state /tmp/site-extra.campaign.json
```

`kind = "eessi"` launches `eessi_container.sh`. `scripts/eessi-extend-eb.sh`
loads `EESSI-extend` and execs `eb`. Site installs set `EESSI_SITE_INSTALL=1`
`kind = "eessi"` launches `eessi_container.sh`. `eb-local` with
`EB_LOCAL_EESSI_EXTEND=1` loads `EESSI-extend` and execs `eb`. Site installs set `EESSI_SITE_INSTALL=1`
in the target environment layer. `exts_list` on `SciPy-bundle` /
`Python-bundle-PyPI` / `R-bundle-CRAN` is a Resolvo provide: do not
reinstall numpy or a CRAN package the stack already ships.
Expand Down
Loading
Loading