From 05277d92da7802830ef52ddda6a621e970f64795 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 7 Aug 2023 16:21:19 -0400
Subject: ci: Add ROCm HIP to Fedora base image

---
 .gitlab/ci/docker/fedora38/deps_packages.lst | 7 +++++++
 .gitlab/os-linux.yml                         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/docker/fedora38/deps_packages.lst b/.gitlab/ci/docker/fedora38/deps_packages.lst
index c7c1385..da050d9 100644
--- a/.gitlab/ci/docker/fedora38/deps_packages.lst
+++ b/.gitlab/ci/docker/fedora38/deps_packages.lst
@@ -44,6 +44,13 @@ file
 jq
 which
 
+# Install HIP language toolchain.
+hsakmt-devel
+lld
+rocm-comgr-devel
+rocm-hip-devel
+rocm-runtime-devel
+
 # Packages needed to test CTest.
 breezy
 subversion
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index dd6299e..e4ece1e 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora38:
-    image: "kitware/cmake:ci-fedora38-x86_64-2023-05-22"
+    image: "kitware/cmake:ci-fedora38-x86_64-2023-08-07"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
-- 
cgit v0.12


From cffa56c9186e1fadf24b9410240d7f9774501eee Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 7 Aug 2023 16:46:38 -0400
Subject: ci: Add HIP job based on Fedora image

The Fedora `rocm-hip-devel` package organizes the `hip-lang` cmake package
differently from the official ROCm base images.  Cover it separately.

Issue: #25050
---
 .gitlab-ci.yml                                 | 10 ++++++++++
 .gitlab/ci/configure_fedora38_hip_radeon.cmake |  3 +++
 .gitlab/ci/env_fedora38_hip_radeon.sh          |  1 +
 .gitlab/os-linux.yml                           |  7 +++++++
 4 files changed, 21 insertions(+)
 create mode 100644 .gitlab/ci/configure_fedora38_hip_radeon.cmake
 create mode 100644 .gitlab/ci/env_fedora38_hip_radeon.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac4eb2e..fbf1947 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,6 +205,16 @@ t:debian12-hip-radeon:
     variables:
         CMAKE_CI_NO_MR: "true"
 
+t:fedora38-hip-radeon:
+    extends:
+        - .fedora38_hip_radeon
+        - .cmake_test_linux_release
+        - .linux_x86_64_tags_radeon
+        - .run_dependent
+        - .needs_centos6_x86_64
+    variables:
+        CMAKE_CI_NO_MR: "true"
+
 t:fedora38-ninja-clang:
     extends:
         - .fedora38_ninja_clang
diff --git a/.gitlab/ci/configure_fedora38_hip_radeon.cmake b/.gitlab/ci/configure_fedora38_hip_radeon.cmake
new file mode 100644
index 0000000..58036b0
--- /dev/null
+++ b/.gitlab/ci/configure_fedora38_hip_radeon.cmake
@@ -0,0 +1,3 @@
+set(CMake_TEST_HIP "ON" CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
diff --git a/.gitlab/ci/env_fedora38_hip_radeon.sh b/.gitlab/ci/env_fedora38_hip_radeon.sh
new file mode 100644
index 0000000..812ef5a
--- /dev/null
+++ b/.gitlab/ci/env_fedora38_hip_radeon.sh
@@ -0,0 +1 @@
+export HIPCXX=/usr/bin/clang++-16
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index e4ece1e..ee06a48 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -366,6 +366,13 @@
         CMAKE_CONFIGURATION: debian12_hip_radeon
         CTEST_LABELS: "HIP"
 
+.fedora38_hip_radeon:
+    extends: .fedora38
+
+    variables:
+        CMAKE_CONFIGURATION: fedora38_hip_radeon
+        CTEST_LABELS: "HIP"
+
 ### C++ modules
 
 .gcc_cxx_modules_x86_64:
-- 
cgit v0.12