From 0d48b5425a5dae247e1fea9a726bc1fe395d36a2 Mon Sep 17 00:00:00 2001
From: Mikael Stellio <67868694+stelliom@users.noreply.github.com>
Date: Tue, 24 Mar 2026 19:31:20 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Update=20uenv=20version=20for=20tests=20aft?=
 =?UTF-8?q?er=20S=C3=A4ntis=20OS=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cscs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cscs.yml b/cscs.yml
index ee078752e9..13108ad29e 100644
--- a/cscs.yml
+++ b/cscs.yml
@@ -39,7 +39,7 @@ stages:
 .test_common:
   extends: .baremetal-runner-santis-gh200
   variables:
-    UENV: 'icon/25.2:v1'
+    UENV: 'icon/25.2:v4'
   script:
     - !reference [.setup_python, script]
     - !reference [.setup_uenv, script]

From 5830db90d63b70b8a1b9075972b5e7aa404ccf7e Mon Sep 17 00:00:00 2001
From: Mikael Stellio <67868694+stelliom@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:45:14 +0100
Subject: [PATCH 2/2] Use nvhpc for icontools test

---
 test/common_system_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/common_system_test.py b/test/common_system_test.py
index 3e960d791b..3074c8b7a3 100644
--- a/test/common_system_test.py
+++ b/test/common_system_test.py
@@ -38,7 +38,7 @@ def test_install_icon(version):
 # Error: Type mismatch in argument 'size_dummy' at (1); passed INTEGER(8) to INTEGER(4) cdi_write_f2003.f90:31:37
 def test_install_icontools():
     spack_install(
-        "icontools @c2sm-master %gcc ~mpi ^netcdf-fortran%gcc", test_root=False
+        "icontools @c2sm-master %nvhpc ~mpi ^netcdf-fortran%gcc", test_root=False
     )