From a0a5b1d5c379629542fae008eb171fe9ffbcf3cf Mon Sep 17 00:00:00 2001 From: germann_e Date: Fri, 21 Jun 2024 10:54:25 +0200 Subject: [PATCH] FIX: add include_concrete to see admin installations --- env/rhel7/x86_64/users/stable/spack.yaml | 15 ++++++++------ env/rhel7/x86_64/users/unstable/spack.yaml | 23 +++++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml index 4996217..8790867 100644 --- a/env/rhel7/x86_64/users/stable/spack.yaml +++ b/env/rhel7/x86_64/users/stable/spack.yaml @@ -7,13 +7,16 @@ spack: - $spack/../user/$user/spack-stage install_tree: root: $spack/../user/$user/spack-install - upstreams: - stable: - install_tree: $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__ + include: + - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml + - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml + include_concrete: + - $spack/spack-psi/env/rhel7/x86_64/admin/stable mirrors: local_stable: file:///afs/psi.ch/software/spack/stable - include: - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml specs: [] + upstreams: + stable: + install_tree: >- + $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__ view: false diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml index 9f8b58c..d6e4f36 100644 --- a/env/rhel7/x86_64/users/unstable/spack.yaml +++ b/env/rhel7/x86_64/users/unstable/spack.yaml @@ -4,18 +4,23 @@ spack: config: allow_sgid: false build_stage: - - $spack/../user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/../user/$user/spack-install - upstreams: - stable: - install_tree: $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__ - unstable: - install_tree: $spack/opt/spack/unstable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder_ + include: + - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml + - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml + include_concrete: + - $spack/spack-psi/env/rhel7/x86_64/admin/stable + - $spack/spack-psi/env/rhel7/x86_64/admin/unstable mirrors: local_unstable: file:///afs/psi.ch/software/spack/unstable - include: - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml specs: [] + upstreams: + stable: + install_tree: >- + $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__ + unstable: + install_tree: >- + $spack/opt/spack/unstable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder_ view: false