Merge topic 'fix-frontier-ci' into release-2.2

eed6da13 ci: set OLCF_ID_TOKEN var in frontier ci

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3292

.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()
 

.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