From 5e2488994b8c8337ca94e05e09cbf4eec4a718ed Mon Sep 17 00:00:00 2001
From: Ben Cumming <bcumming@cscs.ch>
Date: Fri, 19 Jan 2024 17:29:07 +0100
Subject: [PATCH] split cray packages (#61)

---
 ci/config/configuration.py                      | 1 +
 recipes/prgenv-gnu/23.11/a100/environments.yaml | 2 +-
 scripts/setup-oras                              | 4 +---
 scripts/setup-stackinator                       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ci/config/configuration.py b/ci/config/configuration.py
index b90376fa..fc94360b 100644
--- a/ci/config/configuration.py
+++ b/ci/config/configuration.py
@@ -205,6 +205,7 @@ def job_template(self, env):
             runner["variables"]["F7T_TOKEN_URL"] = "https://auth.cscs.ch/auth/realms/firecrest-clients/protocol/openid-connect/token"
             runner["variables"]["F7T_URL"] = "https://firecrest.cscs.ch"
             runner["variables"]["MODE"] = "baremetal"
+            runner["variables"]["SLURM_ACCOUNT"] = "csstaff"
             runner["variables"]["FIRECREST_SYSTEM"] = env["system"]
         # else configure baremetal runners deployed via Ansible/Nomad
         else:
diff --git a/recipes/prgenv-gnu/23.11/a100/environments.yaml b/recipes/prgenv-gnu/23.11/a100/environments.yaml
index ccb7bd35..39035bef 100644
--- a/recipes/prgenv-gnu/23.11/a100/environments.yaml
+++ b/recipes/prgenv-gnu/23.11/a100/environments.yaml
@@ -3,7 +3,7 @@ gcc-env:
       - toolchain: gcc
         spec: gcc@11
   mpi:
-      spec: cray-mpich
+      spec: cray-mpich@8.1.26
       gpu: cuda
   unify: true
   specs:
diff --git a/scripts/setup-oras b/scripts/setup-oras
index 8fad1786..ba5424d2 100755
--- a/scripts/setup-oras
+++ b/scripts/setup-oras
@@ -20,9 +20,7 @@ oras_creds="$(echo ${creds_json} | jq --join-output '"--username " + .container_
 jfrog_u="$(echo ${creds_json} | jq -r '.container_registry.username')"
 jfrog_p="$(echo ${creds_json} | jq -r '.container_registry.password')"
 
-log "${jfrog_u} ${jfrog_p}"
-
-log "logging in to jfrog.svc.cscs.ch with oras"
+log "log in to jfrog.svc.cscs.ch with oras"
 
 # Create a unique credentials path for this job,
 # because by default credentials are stored in ~/.docker/config.json which
diff --git a/scripts/setup-stackinator b/scripts/setup-stackinator
index 7f7eb3b1..f3d04123 100755
--- a/scripts/setup-stackinator
+++ b/scripts/setup-stackinator
@@ -5,7 +5,7 @@ tool_base_path="$(pwd)"
 # builds in the same pipeline do not conflict
 tool_path=`mktemp -d`
 tool_repo=https://github.com/eth-cscs/stackinator.git
-tool_version=ad2281b2c094b043b2dd256ea224613943f47c14
+tool_version=d9f0026c9884a0685296ec06aaadf1ce8f6541b2
 
 log "installing stackinator from git in '${tool_path}'"