From 4273b936dcddf6b1d4a3475ad1683848a78d24b5 Mon Sep 17 00:00:00 2001
From: germann_e <elsa.germann@psi.ch>
Date: Thu, 27 Jun 2024 09:19:19 +0200
Subject: [PATCH] FIX: remove shared config in envs

---
 env/rhel7/x86_64/admin/stable/spack.yaml    | 3 ---
 env/rhel7/x86_64/users/stable/spack.yaml    | 6 ------
 env/rhel7/x86_64/users/unstable/spack.yaml  | 6 ------
 env/sles15/x86_64/admin/stable/spack.yaml   | 3 ---
 env/sles15/x86_64/admin/unstable/spack.yaml | 3 ---
 env/sles15/x86_64/users/unstable/spack.yaml | 6 ------
 6 files changed, 27 deletions(-)

diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml
index 0828419..62313c8 100644
--- a/env/rhel7/x86_64/admin/stable/spack.yaml
+++ b/env/rhel7/x86_64/admin/stable/spack.yaml
@@ -3,9 +3,6 @@ spack:
   concretizer:
     unify: false
   config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/stable
   include:
diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml
index 5238f16..a73cc05 100644
--- a/env/rhel7/x86_64/users/stable/spack.yaml
+++ b/env/rhel7/x86_64/users/stable/spack.yaml
@@ -1,12 +1,6 @@
 spack:
   concretizer:
     unify: false
-  config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
-    install_tree:
-      root: $spack/../user/$user/spack-install
   include:
     - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
     - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml
index 172b2eb..89cf816 100644
--- a/env/rhel7/x86_64/users/unstable/spack.yaml
+++ b/env/rhel7/x86_64/users/unstable/spack.yaml
@@ -1,12 +1,6 @@
 spack:
   concretizer:
     unify: false
-  config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
-    install_tree:
-      root: $spack/../user/$user/spack-install
   include:
     - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
     - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml
index cddf31a..bfb7bbd 100644
--- a/env/sles15/x86_64/admin/stable/spack.yaml
+++ b/env/sles15/x86_64/admin/stable/spack.yaml
@@ -3,9 +3,6 @@ spack:
   concretizer:
     unify: false
   config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/stable
   include:
diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml
index fde7568..d286d5d 100644
--- a/env/sles15/x86_64/admin/unstable/spack.yaml
+++ b/env/sles15/x86_64/admin/unstable/spack.yaml
@@ -2,9 +2,6 @@ spack:
   concretizer:
     unify: false
   config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/unstable
   include:
diff --git a/env/sles15/x86_64/users/unstable/spack.yaml b/env/sles15/x86_64/users/unstable/spack.yaml
index eef531a..b58f29e 100644
--- a/env/sles15/x86_64/users/unstable/spack.yaml
+++ b/env/sles15/x86_64/users/unstable/spack.yaml
@@ -1,12 +1,6 @@
 spack:
   concretizer:
     unify: false
-  config:
-    allow_sgid: false
-    build_stage:
-      - $spack/../user/$user/spack-stage
-    install_tree:
-      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