From 3df5583e0ab88d8560d3ecd678fc34d43a787cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 20:04:26 +0100 Subject: [PATCH 1/9] add defaults dir --- .../create_cvmfs_content_structure/vars/software.eessi.io.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index cb37809e..e740ca3b 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -2,6 +2,9 @@ # 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' From 91f16a1d0a37514ee74c16656aa8511b2c2cfdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 20:07:31 +0100 Subject: [PATCH 2/9] add nvidia variant symlinks --- .../create_cvmfs_content_structure/vars/software.eessi.io.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index e740ca3b..ed354ce5 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -22,6 +22,10 @@ files: # noqa: var-naming[no-role-prefix] mode: '644' symlinks: # noqa: var-naming[no-role-prefix] + defaults/nvidia: '$(EESSI_NVIDIA_OVERRIDE_DEFAULT:-/dev/null)' host_injections: '$(EESSI_HOST_INJECTIONS:-/opt/eessi)' 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/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)' From 96c108ee7139c81497b0a56bfab523c150559cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 20:42:36 +0100 Subject: [PATCH 3/9] use loop instead of with_items --- roles/create_cvmfs_content_structure/tasks/do_repo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/create_cvmfs_content_structure/tasks/do_repo.yml b/roles/create_cvmfs_content_structure/tasks/do_repo.yml index 12c8931c..db06e2da 100644 --- a/roles/create_cvmfs_content_structure/tasks/do_repo.yml +++ b/roles/create_cvmfs_content_structure/tasks/do_repo.yml @@ -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" @@ -26,7 +26,7 @@ src: "{{ symlinks[item] }}" state: link force: true - with_items: "{{ symlinks }}" + loop: "{{ symlinks | flatten }}" register: create_cvmfs_content_structure_create_symlinks - name: "Copy files" @@ -34,7 +34,7 @@ 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 From eeb20721aae0355dba0a95b04b80a161283c0b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:15:22 +0100 Subject: [PATCH 4/9] ensure that compat layer lib dirs exist (in CI) --- .../vars/software.eessi.io.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index ed354ce5..240ded67 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -8,6 +8,16 @@ directories: # noqa: var-naming[no-role-prefix] - 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: '' From ade701627b431e8d1e40df433172dd7720878980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:19:51 +0100 Subject: [PATCH 5/9] remove trailing space --- .github/workflows/test-playbooks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-playbooks.yml b/.github/workflows/test-playbooks.yml index 07716c1f..bf434514 100644 --- a/.github/workflows/test-playbooks.yml +++ b/.github/workflows/test-playbooks.yml @@ -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 From ccde61ba80cbabca039d9d883e25423568b81aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:23:44 +0100 Subject: [PATCH 6/9] exclude .github dir --- .github/workflows/ansible-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 72e4d417..eaf56762 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -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" From f6c0df960e90b1ae6987850f608d1b538983ef93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:26:19 +0100 Subject: [PATCH 7/9] add generic lib override symlinks --- .../create_cvmfs_content_structure/vars/software.eessi.io.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index 240ded67..495410ea 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -33,9 +33,13 @@ files: # noqa: var-naming[no-role-prefix] symlinks: # noqa: var-naming[no-role-prefix] defaults/nvidia: '$(EESSI_NVIDIA_OVERRIDE_DEFAULT:-/dev/null)' + defaults/override: '$(EESSI_LIB_OVERRIDE_DEFAULT:-/dev/null)' host_injections: '$(EESSI_HOST_INJECTIONS:-/opt/eessi)' 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/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)' From a2cd4743358c8612c538c2df72caf05c9de34ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:27:27 +0100 Subject: [PATCH 8/9] amd variant symlinks, disabled for now --- .../create_cvmfs_content_structure/vars/software.eessi.io.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index 495410ea..d8f92085 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -32,11 +32,15 @@ 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)' 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)' From 2013e2c157aa74173e42bb0a9d27cb195e94c03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 4 Feb 2026 23:29:14 +0100 Subject: [PATCH 9/9] start comments with space --- .../vars/software.eessi.io.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml index d8f92085..6d33c51a 100644 --- a/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml +++ b/roles/create_cvmfs_content_structure/vars/software.eessi.io.yml @@ -32,15 +32,15 @@ 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/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)' 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/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)'