pilatus configuration (#108)

* add pilatus configuration * deploy netcdf tools on pilatus * allow overwriting of default env variables when using f7t
eth-cscs · Jun 3, 2024 · 6f18583 · 6f18583
1 parent 172983a
commit 6f18583
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/ci/config/configuration.py b/ci/config/configuration.py
@@ -34,8 +34,6 @@ def __init__(self, name, uenv_name, desc, recipe_path):
         self._mount = desc["mount"]
         self._recipe_path = recipe_path
 
-        arch = self.uarch
-
     @property
     def name(self):
         return self._name
@@ -213,12 +211,18 @@ def job_template(self, env):
 
         # configure for firecrest, if it is used on the target cluster
         if use_f7t:
-            # set additional environment variables required for FirecREST.
-            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"]
+            # default values for environment variables required by firecrest
+            f7t_defaults = {
+                    "F7T_TOKEN_URL": "https://auth.cscs.ch/auth/realms/firecrest-clients/protocol/openid-connect/token",
+                    "F7T_URL": "https://firecrest.cscs.ch",
+                    "MODE": "baremetal",
+                    "SLURM_ACCOUNT": "csstaff",
+                    "FIRECREST_SYSTEM": env["system"]}
+            # set the defaults for values that have not already been set in the
+            # cluster config.
+            for key, value in f7t_defaults.items():
+                if key not in runner["variables"].keys():
+                    runner["variables"][key] = value
         # else configure baremetal runners deployed via Ansible/Nomad
         else:
             runner["baremetal_runner"] = cluster["runner"]["baremetal-tag"]

diff --git a/config.yaml b/config.yaml
@@ -19,6 +19,16 @@ clusters:
     runner:
       slurm-tag: balfrin-spack-stack-builder
       baremetal-tag: balfrin-login-baremetal
+  pilatus:
+    targets:
+      -
+        uarch: 'zen2'
+        partition: 'normal'
+        variables:
+          SLURM_CONSTRAINT: 'mc'
+          F7T_URL: 'https://firecrest-dev.cscs.ch'
+    runner: f7t
+    #no_bwrap: True
   santis:
     targets:
       -
@@ -134,6 +144,7 @@ uenvs:
         gh200: '2024/arm64'
       deploy:
         eiger: [zen2]
+        pilatus: [zen2]
         balfrin: [zen3]
         todi: [gh200]
       develop: False