From 4eafd381e5a16c506d610289857499c6056feb92 Mon Sep 17 00:00:00 2001
From: germann_e <elsa.germann@psi.ch>
Date: Mon, 29 Jul 2024 17:15:56 +0200
Subject: [PATCH] FIX: rename psi_mirror back to testing mirror (fails) SLES15

---
 env/sles15/x86_64/admin/stable/spack.yaml   | 3 +--
 env/sles15/x86_64/admin/testing/spack.yaml  | 3 +--
 env/sles15/x86_64/admin/unstable/spack.yaml | 3 +--
 env/sles15/x86_64/users/stable/spack.yaml   | 5 ++---
 env/sles15/x86_64/users/unstable/spack.yaml | 8 +++-----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml
index 9af8e7b..220ff9f 100644
--- a/env/sles15/x86_64/admin/stable/spack.yaml
+++ b/env/sles15/x86_64/admin/stable/spack.yaml
@@ -5,7 +5,6 @@ spack:
   config:
     install_tree:
       root: $spack/opt/spack/stable
-      padded_length: 0
   definitions:
   - gcc_12.3_mpich:
     - relion@4.0.1/ve5sish     #+cuda
@@ -13,7 +12,7 @@ spack:
     - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
     - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/testing
   modules:
     default:
       roots:
diff --git a/env/sles15/x86_64/admin/testing/spack.yaml b/env/sles15/x86_64/admin/testing/spack.yaml
index 1f81513..9fe5ea8 100644
--- a/env/sles15/x86_64/admin/testing/spack.yaml
+++ b/env/sles15/x86_64/admin/testing/spack.yaml
@@ -8,7 +8,6 @@ spack:
   - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
   - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
-    local_testing: file:///afs/psi.ch/software/spack/testing
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
+    local_psi: file:///afs/psi.ch/software/spack/testing
   specs: []
   view: false
diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml
index 3bb7f96..9128ce0 100644
--- a/env/sles15/x86_64/admin/unstable/spack.yaml
+++ b/env/sles15/x86_64/admin/unstable/spack.yaml
@@ -19,8 +19,7 @@ spack:
   - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
   - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/testing
   modules:
     default:
       roots:
diff --git a/env/sles15/x86_64/users/stable/spack.yaml b/env/sles15/x86_64/users/stable/spack.yaml
index da66df6..aa2d223 100644
--- a/env/sles15/x86_64/users/stable/spack.yaml
+++ b/env/sles15/x86_64/users/stable/spack.yaml
@@ -7,10 +7,9 @@ spack:
   include_concrete:
     - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable
   mirrors:
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/testing
   specs: []
   upstreams:
     stable:
-      install_tree: >-
-        $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
   view: false
diff --git a/env/sles15/x86_64/users/unstable/spack.yaml b/env/sles15/x86_64/users/unstable/spack.yaml
index 76da0ad..58c42f0 100644
--- a/env/sles15/x86_64/users/unstable/spack.yaml
+++ b/env/sles15/x86_64/users/unstable/spack.yaml
@@ -8,13 +8,11 @@ spack:
     - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable
     - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/unstable
   mirrors:
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
+    local_psi: file:///afs/psi.ch/software/spack/testing
   specs: []
   upstreams:
     stable:
-      install_tree: >-
-        $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
     unstable:
-      install_tree: >-
-        /afs/psi.ch/sys/spack/system/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_placeh
+      install_tree: $spack/opt/spack/unstable
   view: false