Merge branch 'rhel7' into 'main'

Rhel7

See merge request lsm-hpce/spack-psi!3

env/rhel7/x86_64/admin/stable/spack.yaml

@@ -8,11 +8,11 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/stable
-    include_concrete:
+  include_concrete:
-      - $spack/spack-psi/env/$os/$target_family/admin/unstable
+    - $spack/spack-psi/env/$os/$target_family/admin/unstable
-    include:
+  include:
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   specs: null
   mirrors:
     local_stable: file:///afs/psi.ch/software/spack/stable

env/rhel7/x86_64/admin/testing/spack.yaml

@@ -8,14 +8,14 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/testing
-    upstreams:
+  upstreams:
-      spack-instance-1:
+    spack-instance-1:
-        install_tree: $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
-      spack-instance-2:
+    spack-instance-2:
-        install_tree: $spack/opt/spack/unstable
+      install_tree: $spack/opt/spack/unstable
-    include:
+  include:
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_unstable: file:///afs/psi.ch/software/spack/unstable
     local_testing: file:///afs/psi.ch/software/spack/testing

env/rhel7/x86_64/admin/unstable/spack.yaml

@@ -8,14 +8,14 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/unstable
-    upstreams:
+  upstreams:
-      spack-instance-1:
+    spack-instance-1:
-        install_tree: $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
-    include_concrete:
+  include_concrete:
-      - $spack/spack-psi/env/$os/$target_family/admin/testing
+    - $spack/spack-psi/env/$os/$target_family/admin/testing
-    include:
+  include:
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_stable: file:///afs/psi.ch/software/spack/stable
     local_unstable: file:///afs/psi.ch/software/spack/unstable

env/sles15/x86_64/admin/stable/spack.yaml

@@ -8,11 +8,11 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/stable
-    include_concrete:
+  include_concrete:
-      - $spack/spack-psi/env/$os/$target_family/admin/unstable
+    - $spack/spack-psi/env/$os/$target_family/admin/unstable
-    include:
+  include:
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-      - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_stable: file:///afs/psi.ch/software/spack/stable
     local_unstable: file:///afs/psi.ch/software/spack/unstable

env/sles15/x86_64/admin/testing/spack.yaml

@@ -7,14 +7,14 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/testing
-    upstreams:
+  upstreams:
-      spack-instance-1:
+    spack-instance-1:
-        install_tree: $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
-      spack-instance-2:
+    spack-instance-2:
-        install_tree: $spack/opt/spack/unstable
+      install_tree: $spack/opt/spack/unstable
-    include:
+  include:
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_unstable: file:///afs/psi.ch/software/spack/unstable
     local_testing: file:///afs/psi.ch/software/spack/testing

env/sles15/x86_64/admin/unstable/spack.yaml

@@ -7,14 +7,14 @@ spack:
       - $spack/user/$user/spack-stage
     install_tree:
       root: $spack/opt/spack/unstable
-    upstreams:
+  upstreams:
-      spack-instance-1:
+    spack-instance-1:
-        install_tree: $spack/opt/spack/stable
+      install_tree: $spack/opt/spack/stable
-    include_concrete:
+  include_concrete:
-    - $spack/spack-psi/env/$os/$target_family/admin/testing
+  - $spack/spack-psi/env/$os/$target_family/admin/testing
-    include:
+  include:
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_stable: file:///afs/psi.ch/software/spack/stable
     local_unstable: file:///afs/psi.ch/software/spack/unstable