Feat/stack pinot noir

.gitlab-ci.yml

@@ -23,28 +23,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: [kuma_h100]
+      # - environment: [izar]
+      #   slurm_options: ['-c 40 --gpus 2']
+      #   apptainer_options: ['-nv']
+      #   stack: ["pinot-noir"]
+      # - environment: [jed]
+      #   slurm_options: ["-c 72 -p jed -q jed"]
+      #   stack: ["pinot-noir"]
+      #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
+      - environment: [kuma-h100]
         slurm_options: ["-c 64"]
-        stack: ["pinot-noir-gcc"]
+        stack: ["pinot-noir"]
         apptainer_options: ['--nv']
         app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
-      - environment: [kuma_l40s]
+      - environment: [kuma-l40s]
         slurm_options: ["-c 64"]
-        stack: ["pinot-noir-gcc"]
+        stack: ["pinot-noir"]
         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"]
   tags:
     - ${environment}
     - stack
@@ -71,21 +71,19 @@ variables:
     FAKEHOME: "/scratch/$(id -un)"
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
     STACK_VERSION: $(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
-    image_name: "${stack}-${environment}-${SQUASHFS_ID}"
+    image_name: ${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}
     squashfs_image: $(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
     APPTAINER_EXEC_OPTIONS: >-
       ${apptainer_options}
          --cleanenv
          -H $(mktemp -d -p ${FAKEHOME}/):/home/$(id -un)
+         --env PYTHONUNBUFFERED=1
          --bind ${CI_DATA_LT}/buildcache:${MOUNT_POINT}/buildcache
          --bind ${CI_DATA_LT}/spack-mirror:${MOUNT_POINT}/spack-mirror
          --bind ${CI_DATA_ST}/squashfs-cache/:/squashfs-cache
          --bind ${CI_DATA_ST}/overlayfs:/overlayfs
          --fusemount "host:${CI_PROJECT_DIR}/ci/squashfuse_ll.sh ${CI_DATA_ST} ${image_name} ${squashfs_image} /overlayfs/lower-${image_name}"
          --fusemount "container:${CI_PROJECT_DIR}/ci/fuse-overlayfs.sh ${image_name} ${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}"
-  # after_script:
-  #   - if [ $CI_JOB_STATUS != "success" ]; then exit 0; fi
-  #   - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
 
 .spack_cache:
   cache:
@@ -116,7 +114,7 @@ spack:setup:
   stage: environment
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - ci/setup_spack.sh
     - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
@@ -127,11 +125,11 @@ spack:install_compilers:
   stage: compilers
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - ci/install_compilers.sh
     - source ci/stack_env.sh
-    - ${STACK_LOCATION}/spack/bin/spack -e ${environment} config blame compilers
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} config blame compilers
     - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   artifacts:
     reports:
@@ -144,16 +142,19 @@ spack:concretize:
   stage: concretize
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
 
     - ${STACK_LOCATION}/spack/bin/spack -e ${environment}
           config blame | tee config-${environment}-${stack}.log
 
-    - ${STACK_LOCATION}/spack/bin/spack -e ${environment}
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment}
           concretize | tee concretize-${environment}-${stack}.log
 
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment}
+          mirror create -D -d ${MOUNT_POINT}/spack-mirror -a || /usr//bin/true
+
     - cp ${SPACK_SYSTEM_CONFIG_PATH}/spack.lock spack-${environment}-${stack}.lock
     - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   artifacts:
@@ -169,12 +170,15 @@ spack:install:
   stage: install
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
     - echo "{}" > spack-install-${environment}.xml
 
-    - ${STACK_LOCATION}/spack/bin/spack -e ${environment} install
+    # Cleaning patches in case one has a different hash
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} clean -m
+
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} install
           --log-file spack-install-${environment}.xml
           --log-format junit
           --only-concrete
@@ -206,15 +210,12 @@ spack:mksquashfs:
   stage: deploy
   extends:
     - .parallel_job
-    - .spack_cache
+    #- .spack_cache
   script:
     - source ci/stack_env.sh
+    - mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${SQUASHFS_ID}.sqfs
 
-    - echo "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"
-    - "mksquashfs ${STACK_LOCATION} stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/stack/${stack}/stack-${stack}-${environment}-${CI_COMMIT_REF_SLUG}.sqfs"'
   needs:
     - job: spack:install
-  timeout: 10h
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+  #ressource_group: mksquashfs
+  timeout: 1h