From cf2b2336d084f5b6b31f3f3a4b1ad6b78c53e1da Mon Sep 17 00:00:00 2001 From: germann_e Date: Fri, 14 Jun 2024 11:21:57 +0200 Subject: [PATCH] FIX: wrong build_stage & install paths --- env/rhel7/x86_64/admin/stable/spack.yaml | 2 +- env/rhel7/x86_64/admin/testing/spack.yaml | 2 +- env/rhel7/x86_64/admin/unstable/spack.yaml | 2 +- env/rhel7/x86_64/users/stable/spack.yaml | 4 ++-- env/rhel7/x86_64/users/unstable/spack.yaml | 4 ++-- env/sles15/x86_64/admin/stable/spack.yaml | 2 +- env/sles15/x86_64/admin/testing/spack.yaml | 2 +- env/sles15/x86_64/admin/unstable/spack.yaml | 2 +- env/sles15/x86_64/users/stable/spack.yaml | 4 ++-- env/sles15/x86_64/users/unstable/spack.yaml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml index a40e24c..cddf31a 100644 --- a/env/rhel7/x86_64/admin/stable/spack.yaml +++ b/env/rhel7/x86_64/admin/stable/spack.yaml @@ -5,7 +5,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/stable include: diff --git a/env/rhel7/x86_64/admin/testing/spack.yaml b/env/rhel7/x86_64/admin/testing/spack.yaml index fc09333..2ee041e 100644 --- a/env/rhel7/x86_64/admin/testing/spack.yaml +++ b/env/rhel7/x86_64/admin/testing/spack.yaml @@ -5,7 +5,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/testing include: diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml index c19ab9d..18fe838 100644 --- a/env/rhel7/x86_64/admin/unstable/spack.yaml +++ b/env/rhel7/x86_64/admin/unstable/spack.yaml @@ -5,7 +5,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/unstable include: diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml index 572f855..d919748 100644 --- a/env/rhel7/x86_64/users/stable/spack.yaml +++ b/env/rhel7/x86_64/users/stable/spack.yaml @@ -4,9 +4,9 @@ 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 + root: $spack/../user/$user/spack-install mirrors: local_stable: file:///afs/psi.ch/software/spack/stable include: diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml index ad6a306..30d958c 100644 --- a/env/rhel7/x86_64/users/unstable/spack.yaml +++ b/env/rhel7/x86_64/users/unstable/spack.yaml @@ -4,9 +4,9 @@ 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 + root: $spack/../user/$user/spack-install mirrors: local_unstable: file:///afs/psi.ch/software/spack/unstable include: diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml index a40e24c..cddf31a 100644 --- a/env/sles15/x86_64/admin/stable/spack.yaml +++ b/env/sles15/x86_64/admin/stable/spack.yaml @@ -5,7 +5,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/stable include: diff --git a/env/sles15/x86_64/admin/testing/spack.yaml b/env/sles15/x86_64/admin/testing/spack.yaml index 6904c8d..c613bbd 100644 --- a/env/sles15/x86_64/admin/testing/spack.yaml +++ b/env/sles15/x86_64/admin/testing/spack.yaml @@ -4,7 +4,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/testing include: diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml index e3126a6..fde7568 100644 --- a/env/sles15/x86_64/admin/unstable/spack.yaml +++ b/env/sles15/x86_64/admin/unstable/spack.yaml @@ -4,7 +4,7 @@ spack: config: allow_sgid: false build_stage: - - $spack/user/$user/spack-stage + - $spack/../user/$user/spack-stage install_tree: root: $spack/opt/spack/unstable include: diff --git a/env/sles15/x86_64/users/stable/spack.yaml b/env/sles15/x86_64/users/stable/spack.yaml index 16e3fd0..5a698e0 100644 --- a/env/sles15/x86_64/users/stable/spack.yaml +++ b/env/sles15/x86_64/users/stable/spack.yaml @@ -4,9 +4,9 @@ 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 + root: $spack/../user/$user/spack-install include: - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml diff --git a/env/sles15/x86_64/users/unstable/spack.yaml b/env/sles15/x86_64/users/unstable/spack.yaml index 302ffd9..eef531a 100644 --- a/env/sles15/x86_64/users/unstable/spack.yaml +++ b/env/sles15/x86_64/users/unstable/spack.yaml @@ -4,9 +4,9 @@ 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 + root: $spack/../user/$user/spack-install include: - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml