From 3d942534897d21b2ed0ed3cefa6afadfd96c8ea1 Mon Sep 17 00:00:00 2001
From: germann_e <elsa.germann@psi.ch>
Date: Fri, 7 Jun 2024 20:39:59 +0200
Subject: [PATCH] ADD: include_concrete for stable and unstable env

---
 env/sles15/x86_64/admin/stable/spack.yaml   | 2 ++
 env/sles15/x86_64/admin/unstable/spack.yaml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml
index debca59..38ee16f 100644
--- a/env/sles15/x86_64/admin/stable/spack.yaml
+++ b/env/sles15/x86_64/admin/stable/spack.yaml
@@ -7,6 +7,8 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/stable
+    include_concrete:
+    - $spack/spack-psi/env/$os/$target_family/admin/unstable
     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/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml
index 237bf50..8f09ecf 100644
--- a/env/sles15/x86_64/admin/unstable/spack.yaml
+++ b/env/sles15/x86_64/admin/unstable/spack.yaml
@@ -6,10 +6,12 @@ spack:
     build_stage:
       - $spack/user/$user/spack-stage
     install_tree:
-      root: $spack/opt/spack/$env
+      root: $spack/opt/spack/unstable
     upstreams:
       spack-instance-1:
         install_tree: $spack/opt/spack/stable
+    include_concrete:
+    - $spack/spack-psi/env/$os/$target_family/admin/testing
     include:
     - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
     - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml