From f80de64581e517fcc902aa1352fecdfa9a08ec91 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 11 Apr 2025 14:40:18 -0400 Subject: [PATCH] ci: add tags to tie HIP jobs to runners with matching hardware This is necessary to add CI runners with newer AMD GPUs over time. --- .gitlab-ci.yml | 6 +++--- .gitlab/os-linux.yml | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a473e7d39d..b5a243b8ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ t:debian12-hip-radeon: extends: - .debian12_hip_radeon - .cmake_test_linux_release - - .linux_x86_64_tags_radeon + - .linux_x86_64_tags_rocm5.2 - .run_dependent - .needs_centos7_x86_64 variables: @@ -231,7 +231,7 @@ t:fedora41-hip-radeon: extends: - .fedora41_hip_radeon - .cmake_test_linux_release - - .linux_x86_64_tags_radeon + - .linux_x86_64_tags_rocm6.2 - .run_dependent - .needs_centos7_x86_64 variables: @@ -455,7 +455,7 @@ t:hip6.3-radeon: extends: - .hip6.3_radeon - .cmake_test_linux_release - - .linux_x86_64_tags_radeon + - .linux_x86_64_tags_rocm6.3 - .run_dependent - .needs_centos7_x86_64 variables: diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index cf3566c134..e631282220 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -567,10 +567,27 @@ - docker - linux-x86_64-v3 -.linux_x86_64_tags_radeon: +.linux_x86_64_tags_rocm5.2: tags: - cmake - radeon + - rocm-5.2 + - docker + - linux-x86_64 + +.linux_x86_64_tags_rocm6.2: + tags: + - cmake + - radeon + - rocm-6.2 + - docker + - linux-x86_64 + +.linux_x86_64_tags_rocm6.3: + tags: + - cmake + - radeon + - rocm-6.3 - docker - linux-x86_64