Moving CI to new runners

.gitlab-ci.yml

@@ -18,8 +18,7 @@ workflow:
 
 variables:
   TERM: ansi
-  CI_DATA_LT: "/work/scitas-ge/richart/ci"
-  CI_DATA_ST: "/scratch/richart/ci"
+  CI_DATA_LT: "/work/scitas-ge/$(id -un)/ci"
 
 .parallel_definition:
   parallel:
@@ -29,23 +28,28 @@ variables:
       #   stack: ["pinot-noir"]
       #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
       # - environment: [izar]
+      #   path_suffix: ''
       #   slurm_options: ['-c 40 --gpus 2']
       #   apptainer_options: ['-nv']
       #   stack: ["pinot-noir"]
+      #   path_suffix: 'izar/'
       # - environment: [jed]
       #   slurm_options: ["-c 72 -p jed -q jed"]
       #   stack: ["pinot-noir"]
       #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+      #   path_suffix: ''
       - environment: [kuma-h100]
         slurm_options: ["-c 64"]
         stack: ["pinot-noir"]
         apptainer_options: ['--nv']
         app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+        path_suffix: ''
       - environment: [kuma-l40s]
         slurm_options: ["-c 64"]
         stack: ["pinot-noir"]
         apptainer_options: ['--nv']
         app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+        path_suffix: ''
   tags:
     - ${environment}
     - stack
@@ -71,8 +75,9 @@ variables:
     - .parallel_definition
     - .squashfs_var
   variables:
+    CI_DATA_ST: "/scratch/${path_suffix}$(id -un)/ci"
     MOUNT_POINT: $(jq -Mrc .stack.mount_point ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
-    FAKEHOME: "/scratch/$(id -un)"
+    FAKEHOME: "${CI_DATA_ST}/homes"
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
     STACK_VERSION: $(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
     image_name: ${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}
@@ -94,6 +99,7 @@ variables:
 spack:checkout:
   stage: .pre
   variables:
+    CI_DATA_ST: "/scratch/${path_suffix}scitas-stack/ci"
     APPTAINER_EXEC_OPTIONS: >-
       --cleanenv
       --bind ${CI_DATA_LT}

ci/apptainer_by_hand.sh

 #!/usr/bin/env sh
 
-export CI_DATA_LT="/work/scitas-ge/richart/ci"
-export CI_DATA_ST="/scratch/richart/ci"
+export CI_DATA_LT="/work/scitas-ge//$(id -un)/ci"
+export CI_DATA_ST="/scratch//$(id -un)/ci"
 srun_options="-N1 -n1 -c 64 -p h100"
 apptainer_options="--nv"
 
@@ -11,7 +11,7 @@ export environment=kuma-h100
 export SQUASHFS_ID=local
 export CI_PIPELINE_ID=1337
 
-export FAKEHOME="/scratch/$(id -un)"
+export FAKEHOME="${CI_DATA_ST}/homes"
 
 export CI_PROJECT_DIR=$PWD
 export GPG_PRIVATE_KEY=${CI_PROJECT_DIR}/stacks/buildcache.pem

ci/prepare_squashfs.sh

@@ -5,6 +5,8 @@ set -o nounset
 set -o errexit
 source ${CI_PROJECT_DIR}/ci/stack_env.sh
 
+mkdir ${CI_DATA_ST}/homes
+
 for i in squashfs-cache buildcache spack-mirror
 do
     if [ ! -e ${CI_DATA_LT}/$i ]