From eed6da13484a090bca1fd7aae764b0d3b67d2ef9 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Mon, 6 Jan 2025 13:40:01 -0500
Subject: [PATCH] ci: set OLCF_ID_TOKEN var in frontier ci

- Also removes the zstd frontier module.
---
 .gitlab/ci/ctest_test.cmake | 2 +-
 .gitlab/ci/frontier.yml     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/ctest_test.cmake b/.gitlab/ci/ctest_test.cmake
index 9568562546..725cd7b37b 100644
--- a/.gitlab/ci/ctest_test.cmake
+++ b/.gitlab/ci/ctest_test.cmake
@@ -36,7 +36,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
   set(junit_args OUTPUT_JUNIT "${CTEST_BINARY_DIRECTORY}/junit.xml")
 endif()
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.17 AND DEFINED CTEST_REPEAT_UNTIL_PASS)
   set(repeat_args REPEAT "UNTIL_PASS:${CTEST_REPEAT_UNTIL_PASS}")
 endif()
 
diff --git a/.gitlab/ci/frontier.yml b/.gitlab/ci/frontier.yml
index 031fbbeee2..f17837d725 100644
--- a/.gitlab/ci/frontier.yml
+++ b/.gitlab/ci/frontier.yml
@@ -10,6 +10,11 @@
 ##
 ##=============================================================================
 
+default:
+  id_tokens:
+    OLCF_ID_TOKEN:
+      aud: https://code.olcf.ornl.gov
+
 # Ad-hoc build that runs in the ECP Hardware, concretely in OLCF Spock.
 .frontier_gcc_hip:
   variables:
@@ -45,7 +50,6 @@
       git
       git-lfs
       ninja
-      zstd
     OLCF_SERVICE_ACCOUNT: "ums033_auser"
     VTKM_SETTINGS: kokkos+hip+gfx90a+frontier+ccache+no_rendering
   interruptible: true
-- 
GitLab