Merge remote-tracking branch 'origin/release/pinot-noir/rhel9.4' into...

Merge remote-tracking branch 'origin/release/pinot-noir/rhel9.4' into correcting-cpu-machines-plus-clang

.gitlab-ci.yml

@@ -19,6 +19,7 @@ workflow:
 variables:
   TERM: ansi
   LANG: en_US.UTF-8
+  REGISTRY_URL: "registry.hpc.epfl.ch"
 
 .parallel_definition:
   parallel:
@@ -26,34 +27,34 @@ variables:
       # - environment: [helvetios]
       #   slurm_options: ["-c 36"]
       #   stack: ["pinot-noir"]
-      #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-jed"]
+      #   app_image: ["registry.hpc.epfl.ch/scitas/scitas-stack:rhel94-kuma"]
       #   path_suffix: ['']
 
       - environment: [izar]
         slurm_options: ['-c 20 --gpus 1 -p gpu -q scitas']
         apptainer_options: ['--nv']
         stack: ["pinot-noir"]
-        app_image: ["registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"]
+        app_image_label: ["rhel94-kuma"]
         path_suffix: ['izar/']
 
       - environment: [jed]
         slurm_options: ["-c 72 -p jed -q jed"]
         stack: ["pinot-noir"]
-        app_image: ["registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"]
+        app_image_label: ["rhel94-kuma"]
         path_suffix: ['']
 
       - environment: [kuma-h100]
         slurm_options: ["-c 16 -q scitas"]
         stack: ["pinot-noir"]
         apptainer_options: ['--nv']
-        app_image: ["registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"]
+        app_image_label: ["rhel94-kuma"]
         path_suffix: ['']
 
       - environment: [kuma-l40s]
         slurm_options: ["-c 16 -q scitas"]
         stack: ["pinot-noir"]
         apptainer_options: ['--nv']
-        app_image: ["registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"]
+        app_image_label: ["rhel94-kuma"]
         path_suffix: ['']
   tags:
     - stack
@@ -74,6 +75,7 @@ variables:
           - ci/**/*
 
   variables:
+    app_image: "${REGISTRY_URL}/scitas-stack/software-stack:${app_image_label}"
     CI_DATA_LT: "/work/scitas-ge/scitas-stack/ci"
     CI_DATA_ST: "/scratch/${path_suffix}scitas-stack/ci"
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
@@ -95,22 +97,21 @@ build_images:
   parallel:
     matrix:
       - IMAGE_NAME: ["rhel94-kuma"]
-  variables:
-    REGISTRY_URL: "registry.hpc.epfl.ch"
   script:
     - echo $ACTIVATION_KEY > /kaniko/ACTIVATION_KEY
-    - echo "{\"auths\":{\"${REGISTRY_URL}\":{\"auth\":\"${REGISTRY_AUTH_CREDENTIALS}\"}}}" > /kaniko/.docker/config.json
+    - cp ${REGISTRY_AUTH_CREDENTIALS} /kaniko/.docker/config.json
     - /kaniko/executor
+        --single-snapshot
         --context "${CI_PROJECT_DIR}/dockerfiles/${IMAGE_NAME}"
         --dockerfile "Dockerfile"
-        --destination "${REGISTRY_URL}/scitas/software-stack:${IMAGE_NAME}"
+        --destination "${REGISTRY_URL}/scitas-stack/software-stack:${IMAGE_NAME}"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      # changes:
-      #   compare_to: ${CI_DEFAULT_BRANCH}
-      #   paths:
-      #     - dockerfiles/${IMAGE_NAME}/*
-      # when: manual
+      changes:
+        compare_to: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
+        paths:
+          - dockerfiles/${IMAGE_NAME}/*
+      when: manual
       allow_failure: true
 
 # ------------------------------------------------------------------------------

ci/apptainer_by_hand.sh

@@ -17,6 +17,13 @@ apptainer_options["jed"]=""
 apptainer_options["kuma-l40s"]="--nv"
 apptainer_options["kuma-h100"]="--nv"
 
+declare -A apptainer_images
+apptainer_images["helvetios"]="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+apptainer_images["izar"]="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+apptainer_images["jed"]="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+apptainer_images["kuma-l40s"]="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+apptainer_images["kuma-h100"]="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+
 export CI_DATA_LT="/work/scitas-ge//$(id -un)/ci"
 export CI_DATA_ST="/scratch//$(id -un)/ci"
 
@@ -31,7 +38,7 @@ export CI_PROJECT_DIR=$PWD
 export GPG_PRIVATE_KEY=${CI_PROJECT_DIR}/stacks/buildcache.pem
 export MOUNT_POINT=$(jq -Mrc .stack.mount_point ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
 
-APPTAINER_IMAGE="docker://registry.hpc.epfl.ch/scitas/software-stack:rhel94-kuma"
+APPTAINER_IMAGE=${apptainer_image[$environment]}
 export image_name=${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}
 
 ./ci/prepare_squashfs.sh

stacks/pinot-noir/spack_oneapi.yaml

@@ -63,9 +63,6 @@ spack:
     - blas_oneapi:
         - "intel-oneapi-mkl"
 
-    # - python_oneapi:
-    #     - python@3.11.7 %gcc@{system_gcc_version}
-
   specs:
     - matrix:
         - [$compilers_specs]