From 781c074049f88b62148cd822280a6d191fc785b8 Mon Sep 17 00:00:00 2001
From: Ben Cumming <bcumming@cscs.ch>
Date: Mon, 22 Jan 2024 18:37:53 +0100
Subject: [PATCH] Add santis config (#63)

---
 ci/config/ci.py                  |  2 +-
 ci/config/schema/config.json     |  7 ++++++-
 ci/config/templates/pipeline.yml |  2 +-
 config.yaml                      | 10 ++++++++++
 run-reframe                      |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ci/config/ci.py b/ci/config/ci.py
index 0801df71..1392aad0 100755
--- a/ci/config/ci.py
+++ b/ci/config/ci.py
@@ -84,7 +84,7 @@ def readenv(config):
     #   - path of the configuration file (required)
     #   - JOB_ID (if needed?)
     if os.getenv("UENVCITEST", default=None) is not None:
-        os.environ["system"] = "eiger"
+        os.environ["system"] = "santis"
         os.environ["uarch"] = "zen2"
         os.environ["uenv"] = "gromacs:2023"
         #os.environ["system"] = "clariden"
diff --git a/ci/config/schema/config.json b/ci/config/schema/config.json
index cf8f9c55..3edf6945 100644
--- a/ci/config/schema/config.json
+++ b/ci/config/schema/config.json
@@ -45,7 +45,12 @@
                                     "additionalProperties": false,
                                     "properties": {
                                         "slurm-tag": {"type": "string"},
-                                        "baremetal-tag":  {"type": "string"}
+                                        "baremetal-tag":  {
+                                            "oneOf": [
+                                                {"type" : "string"},
+                                                {"type" : "null"}
+                                            ]
+                                        }
                                     }
                                 },
                                 {"enum": ["f7t"]}
diff --git a/ci/config/templates/pipeline.yml b/ci/config/templates/pipeline.yml
index 16f3ae80..8f6cece6 100644
--- a/ci/config/templates/pipeline.yml
+++ b/ci/config/templates/pipeline.yml
@@ -40,7 +40,7 @@ build-{{job.uenv}}/{{job.version}}-{{job.system}}/{{job.uarch}}:
     {{ name }}: "{{ value }}"
     {% endfor %}
 
-{% if not job.runner.f7t %}
+{% if (not job.runner.f7t) and (job.runner.baremetal_runner) %}
 
 test-{{job.uenv}}/{{job.version}}-{{job.system}}/{{job.uarch}}:
   extends: .base-test
diff --git a/config.yaml b/config.yaml
index 62ca7308..ca950ba5 100644
--- a/config.yaml
+++ b/config.yaml
@@ -21,6 +21,16 @@ clusters:
     runner:
       slurm-tag: clariden-spack-stack-builder
       baremetal-tag: clariden-login-baremetal
+  santis:
+    targets:
+      -
+        uarch: 'zen2'
+        partition: 'normal'
+    runner:
+      slurm-tag: santis-spack-stack-builder
+      # there is no baremetal tag as of now.
+      #baremetal-tag: null
+      baremetal-tag: santis-login-baremetal
 uenvs:
   gromacs:
     "2023":
diff --git a/run-reframe b/run-reframe
index aa53c76c..48653ce8 100755
--- a/run-reframe
+++ b/run-reframe
@@ -126,6 +126,7 @@ git clone -b alps https://github.com/eth-cscs/cscs-reframe-tests.git
 
 export UENV="${squashfs_path}:${mount}"
 export RFM_AUTODETECT_METHODS="cat /etc/xthostname,hostname"
+export RFM_USE_LOGIN_SHELL=1
 
 REFRAME_COMMAND="reframe -C cscs-reframe-tests/config/cscs.py --report-junit=report.xml -c cscs-reframe-tests/checks/ -r --system=${RFM_SYSTEM}"