From d19f9846aac4ea4c5ceda66aeb48ba3d038c9281 Mon Sep 17 00:00:00 2001 From: germann_e Date: Tue, 5 Nov 2024 10:41:08 +0100 Subject: [PATCH] FIX: add rhel8 concretization to rhel7 and vice versa --- 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 | 1 + env/rhel7/x86_64/users/unstable/spack.yaml | 2 ++ env/rhel8/x86_64/admin/stable/spack.yaml | 2 ++ env/rhel8/x86_64/admin/testing/spack.yaml | 2 ++ env/rhel8/x86_64/admin/unstable/spack.yaml | 2 ++ env/rhel8/x86_64/users/stable/spack.yaml | 1 + env/rhel8/x86_64/users/unstable/spack.yaml | 2 ++ 10 files changed, 18 insertions(+) diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml index 5fa2efd..8af58e0 100644 --- a/env/rhel7/x86_64/admin/stable/spack.yaml +++ b/env/rhel7/x86_64/admin/stable/spack.yaml @@ -15,6 +15,8 @@ spack: include: - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/admin/testing/spack.yaml b/env/rhel7/x86_64/admin/testing/spack.yaml index fcc3df9..330dea6 100644 --- a/env/rhel7/x86_64/admin/testing/spack.yaml +++ b/env/rhel7/x86_64/admin/testing/spack.yaml @@ -10,6 +10,8 @@ spack: include: - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/testing mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml index 552ba85..cc7698e 100644 --- a/env/rhel7/x86_64/admin/unstable/spack.yaml +++ b/env/rhel7/x86_64/admin/unstable/spack.yaml @@ -23,6 +23,8 @@ spack: include: - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/unstable mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml index b277cf2..303956f 100644 --- a/env/rhel7/x86_64/users/stable/spack.yaml +++ b/env/rhel7/x86_64/users/stable/spack.yaml @@ -6,6 +6,7 @@ spack: - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml include_concrete: - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable specs: [] upstreams: stable: diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml index ba9753f..bf8342f 100644 --- a/env/rhel7/x86_64/users/unstable/spack.yaml +++ b/env/rhel7/x86_64/users/unstable/spack.yaml @@ -6,7 +6,9 @@ spack: - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml include_concrete: - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/unstable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/unstable specs: [] upstreams: stable: diff --git a/env/rhel8/x86_64/admin/stable/spack.yaml b/env/rhel8/x86_64/admin/stable/spack.yaml index c1a9581..ec582ed 100644 --- a/env/rhel8/x86_64/admin/stable/spack.yaml +++ b/env/rhel8/x86_64/admin/stable/spack.yaml @@ -15,6 +15,8 @@ spack: include: - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel8/x86_64/admin/testing/spack.yaml b/env/rhel8/x86_64/admin/testing/spack.yaml index 2665576..610b918 100644 --- a/env/rhel8/x86_64/admin/testing/spack.yaml +++ b/env/rhel8/x86_64/admin/testing/spack.yaml @@ -10,6 +10,8 @@ spack: include: - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/testing mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel8/x86_64/admin/unstable/spack.yaml b/env/rhel8/x86_64/admin/unstable/spack.yaml index 116e211..ad93431 100644 --- a/env/rhel8/x86_64/admin/unstable/spack.yaml +++ b/env/rhel8/x86_64/admin/unstable/spack.yaml @@ -23,6 +23,8 @@ spack: include: - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml + include_concrete: + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/unstable mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel8/x86_64/users/stable/spack.yaml b/env/rhel8/x86_64/users/stable/spack.yaml index 31651af..7188dea 100644 --- a/env/rhel8/x86_64/users/stable/spack.yaml +++ b/env/rhel8/x86_64/users/stable/spack.yaml @@ -6,6 +6,7 @@ spack: - $spack/../spack-psi/env/rhel8/x86_64/sysconfigs/compilers.yaml include_concrete: - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable specs: [] upstreams: stable: diff --git a/env/rhel8/x86_64/users/unstable/spack.yaml b/env/rhel8/x86_64/users/unstable/spack.yaml index 90d570f..f0f955a 100644 --- a/env/rhel8/x86_64/users/unstable/spack.yaml +++ b/env/rhel8/x86_64/users/unstable/spack.yaml @@ -7,6 +7,8 @@ spack: include_concrete: - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/unstable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable + - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/unstable specs: [] upstreams: stable: