Merge branch 'main' of gitlab.epfl.ch:SCITAS/software-stack/scitas-software-stacks

.gitlab-ci.yml

@@ -21,31 +21,28 @@ variables:
 .parallel_definition:
   parallel:
     matrix:
-      - environment: [jed]
-        slurm_options: ["-c 72 -p jed -q jed"]
-        stack: ["pinot-noir"]
-        app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
-      - environment: [helvetios]
-        slurm_options: ["-c 36"]
-        stack: ["pinot-noir"]
-        app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+      # - environment: [jed]
+      #   slurm_options: ["-c 72 -p jed -q jed"]
+      #   stack: ["pinot-noir"]
+      #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+      # - environment: [helvetios]
+      #   slurm_options: ["-c 36"]
+      #   stack: ["pinot-noir"]
+      #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
       - environment: [kuma_h100]
-        slurm_options: ["-c 64 -p h100"]
+        slurm_options: ["-c 64"]
         stack: ["pinot-noir-gcc"]
+        apptainer_options: ['--nv']
+        app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+      - environment: [kuma_l40s]
+        slurm_options: ["-c 64"]
+        stack: ["pinot-noir-gcc"]
+        apptainer_options: ['--nv']
         app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
-
       # - environment: [izar]
       #   slurm_options: ['-c 40 --gpus 2']
       #   apptainer_options: ['-nv']
       #   stack: ["pinot-noir"]
-      # - environment: [kuma-l40s]
-      #   slurm_options: ['-c 64 --gres gpu:8']
-      #   apptainer_options: ['-nv']
-      #   stack: ["pinot-noir"]
-      # - environment: [kuma-h100]
-      #   slurm_options: ['-c 64 --gres gpu:4']
-      #   apptainer_options: ['-nv']
-      #   stack: ["pinot-noir"]
   tags:
     - ${environment}
     - stack
@@ -58,7 +55,7 @@ variables:
   extends:
     - .parallel_definition
   variables:
-    MOUNT_POINT: /stack
+    MOUNT_POINT: /ssoft/spack
     BUILDCACHE: "/work/scitas-ge/richart/ci/buildcache"
     MIRROR: "/work/scitas-ge/richart/ci/mirror"
     FAKEHOME: "/scratch/richart"

stacks/pinot-noir-gcc/config.yaml

@@ -3,7 +3,7 @@ config:
   install_missing_compilers: false
 
   install_tree:
-    padded_length: 242
+    padded_length: 227
 
   build_stage:
     - $tempdir/$user/spack-stage

stacks/pinot-noir/config.json

@@ -24,7 +24,7 @@
     },
     "stack": {
         "version": "v1",
-        "mount_point": "/stack",
+        "mount_point": "/ssoft/spack",
         "system_arch": "target=x86_64_v3",
         "system_compiler": {
             "gcc@11": {