Skip to content

add new host injection variant symlinks for 2025.06 #263

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

Open
bedroge wants to merge 9 commits into
base: main
Choose a base branch
from
Open

add new host injection variant symlinks for 2025.06 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3df5583
add defaults dir
bedroge Feb 4, 2026
91f16a1
add nvidia variant symlinks
bedroge Feb 4, 2026
96c108e
use loop instead of with_items
bedroge Feb 4, 2026
eeb2072
ensure that compat layer lib dirs exist (in CI)
bedroge Feb 4, 2026
ade7016
remove trailing space
bedroge Feb 4, 2026
ccde61b
exclude .github dir
bedroge Feb 4, 2026
f6c0df9
add generic lib override symlinks
bedroge Feb 4, 2026
a2cd474
amd variant symlinks, disabled for now
bedroge Feb 4, 2026
2013e2c
start comments with space
bedroge Feb 4, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ansible-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
# path to directories or files to skip. This option is
# repeatable.
# -c C Specify configuration file to use. Defaults to ".ansible-lint"
args: ""
args: "--exclude=.github"
2 changes: 1 addition & 1 deletion .github/workflows/test-playbooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
component: [stratum0, stratum1, localproxy, client]
# Had to drop centos-7 from the matrix due to a dbus issue with the docker run command
# Had to drop centos-7 from the matrix due to a dbus issue with the docker run command
os: [rockylinux-8, ubuntu-20.04, ubuntu-22.04]
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
Expand Down
6 changes: 3 additions & 3 deletions roles/create_cvmfs_content_structure/tasks/do_repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
path: "/cvmfs/{{ cvmfs_repo }}/{{ item.name }}"
state: directory
mode: "{{ item.mode }}"
with_items: "{{ directories }}"
loop: "{{ directories | flatten }}"
register: create_cvmfs_content_structure_create_directories

- name: "Create symlinks"
Expand All @@ -26,15 +26,15 @@
src: "{{ symlinks[item] }}"
state: link
force: true
with_items: "{{ symlinks }}"
loop: "{{ symlinks | flatten }}"
register: create_cvmfs_content_structure_create_symlinks

- name: "Copy files"
ansible.builtin.copy:
src: "{{ item.name }}"
dest: "/cvmfs/{{ cvmfs_repo }}/{{ item.dest }}"
mode: "{{ item.mode }}"
with_items: "{{ files }}"
loop: "{{ files | flatten }}"
register: create_cvmfs_content_structure_create_files

- name: Publish transaction
Expand Down
25 changes: 25 additions & 0 deletions roles/create_cvmfs_content_structure/vars/software.eessi.io.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,22 @@
# Paths for files and symlinks should be relative to the root of the repository.
---
directories: # noqa: var-naming[no-role-prefix]
- name: defaults
mode: '755'

- name: init/modules/EESSI
mode: '755'

# These should exist, but we mainly list them here to prevent failures in CI (where the test repo is empty)
- name: versions/2025.06/compat/linux/aarch64/lib
mode: '775'

- name: versions/2025.06/compat/linux/riscv64/lib
mode: '775'

- name: versions/2025.06/compat/linux/x86_64/lib
mode: '775'

files: # noqa: var-naming[no-role-prefix]
- name: .cvmfsdirtab
dest: ''
Expand All @@ -19,6 +32,18 @@ files: # noqa: var-naming[no-role-prefix]
mode: '644'

symlinks: # noqa: var-naming[no-role-prefix]
# defaults/amd: '$(EESSI_AMD_OVERRIDE_DEFAULT:-/dev/null)'
defaults/nvidia: '$(EESSI_NVIDIA_OVERRIDE_DEFAULT:-/dev/null)'
defaults/override: '$(EESSI_LIB_OVERRIDE_DEFAULT:-/dev/null)'
host_injections: '$(EESSI_HOST_INJECTIONS:-/opt/eessi)'
Copy link
Member

@ocaisa ocaisa Feb 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not to muddy things too much here, but I wonder if this too should also be pointing to /dev/null by default? It is a bit of a security hole as you can inject into MPI binaries via locations in there and this is not explicitly obvious (the default doesn't appear in your local configuration so you would need to actively know that you should be monitoring that).

Copy link
Member

@ocaisa ocaisa Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Granted, for it to be a problem you have to manually create /opt/eessi and lose control of that directory, but if you did that, there's no real record in your CVMFS setup about that.

init/modules/EESSI/2023.06.lua: /cvmfs/software.eessi.io/versions/2023.06/init/modules/EESSI/2023.06.lua
init/modules/EESSI/2025.06.lua: /cvmfs/software.eessi.io/versions/2025.06/init/modules/EESSI/2025.06.lua
# versions/2025.06/compat/linux/aarch64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
# versions/2025.06/compat/linux/riscv64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
# versions/2025.06/compat/linux/x86_64/lib/amd: '$(EESSI_202506_AMD_OVERRIDE:-/cvmfs/software.eessi.io/defaults/amd)'
versions/2025.06/compat/linux/aarch64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
versions/2025.06/compat/linux/riscv64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
versions/2025.06/compat/linux/x86_64/lib/nvidia: '$(EESSI_202506_NVIDIA_OVERRIDE:-/cvmfs/software.eessi.io/defaults/nvidia)'
versions/2025.06/compat/linux/aarch64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'
versions/2025.06/compat/linux/riscv64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'
versions/2025.06/compat/linux/x86_64/lib/override: '$(EESSI_202506_LIB_OVERRIDE:-/cvmfs/software.eessi.io/defaults/override)'
Loading