From 18afd78c2056cb548abb597b40e92f98f741e0a2 Mon Sep 17 00:00:00 2001
From: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:13:50 +0200
Subject: [PATCH] Use rocm@6.1.1 and update Spack (#563)

* Radiuss Spack Configs and Uberenv were reverted to older version

* Use rocm@6.1.1 for local and shared tioga CI jobs

* Point at RSC@main
---
 .gitlab/jobs/tioga.yml        | 4 ++--
 .uberenv_config.json          | 2 +-
 scripts/radiuss-spack-configs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
index 202f7ce23..848d42418 100644
--- a/.gitlab/jobs/tioga.yml
+++ b/.gitlab/jobs/tioga.yml
@@ -28,8 +28,8 @@ master:
     SPEC: " +tests %cce@16.0.1"
   extends: .job_on_tioga
 
-rocmcc_5_7_1_hip:
+rocmcc_6_1_1_hip:
   variables:
     ON_TIOGA: "OFF"
-    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@5.7.1 ^hip@5.7.1 ${PROJECT_TIOGA_DEPS}"
+    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@6.1.1 ^hip@6.1.1 ${PROJECT_TIOGA_DEPS}"
   extends: .job_on_tioga
diff --git a/.uberenv_config.json b/.uberenv_config.json
index f07a37cb7..ea3da6247 100755
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
     "package_source_dir" : "../..",
     "package_final_phase" : "initconfig",
     "spack_url": "https://github.com/spack/spack.git",
-    "spack_branch": "develop-2024-02-18",
+    "spack_branch": "develop-2024-05-26",
     "spack_activate" : {},
     "spack_configs_path": "scripts/radiuss-spack-configs",
     "spack_packages_path": "scripts/radiuss-spack-configs/packages",
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index a8d22367e..7b49b844e 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit a8d22367e03d4c9c180a11886414430bdf6428a8
+Subproject commit 7b49b844e90f9b10101bec6236952c1047c1d0f4