From a68f4b10a83143c1be09df1d5ef46c632709f0af Mon Sep 17 00:00:00 2001
From: hc-github-team-nomad-core
 <82989552+hc-github-team-nomad-core@users.noreply.github.com>
Date: Thu, 16 May 2024 09:49:59 -0400
Subject: [PATCH] backport of commit cabdd7eddbda0d30fa751d9fce085ebd6038dac9
 (#20603)

Co-authored-by: Dianne Laguerta <diannelaguerta@gmail.com>
---
 .github/actionlint.yml           | 8 ++------
 .github/workflows/build.yml      | 6 +++---
 .github/workflows/test-core.yaml | 2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index 530bc6ccafe..9e95094b43f 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -4,11 +4,7 @@
 self-hosted-runner:
   # Labels of self-hosted runner in array of string
   labels:
-    - custom
-    - xl
-    - 22.04
-    - linux
-    - xxl
-    - 20.04
     - custom-windows-medium
     - windows-2019-16core
+    - custom-linux-xxl-nomad-20.04
+    - custom-linux-xl-nomad-22.04
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa1bd6a8717..095412a3a54 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
 
   build-other:
     needs: [get-go-version, get-product-version]
-    runs-on: [ custom, linux, xxl, 20.04 ]
+    runs-on: custom-linux-xxl-nomad-20.04
     strategy:
       matrix:
         goos: [windows]
@@ -128,7 +128,7 @@ jobs:
 
   build-linux:
     needs: [get-go-version, get-product-version]
-    runs-on: [ custom, linux, xxl, 20.04 ]
+    runs-on: custom-linux-xxl-nomad-20.04
     strategy:
       matrix:
         goos: [linux]
@@ -304,7 +304,7 @@ jobs:
     needs:
       - get-product-version
       - build-linux
-    runs-on: [ custom, linux, xxl, 20.04 ]
+    runs-on: custom-linux-xxl-nomad-20.04
     strategy:
       matrix:
         arch: ["arm64", "amd64"]
diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml
index ddd3654b1aa..e997abb0b38 100644
--- a/.github/workflows/test-core.yaml
+++ b/.github/workflows/test-core.yaml
@@ -85,7 +85,7 @@ jobs:
           make dev
   tests-api:
     needs: [mods]
-    runs-on: [custom, xl, 22.04]
+    runs-on: custom-linux-xl-nomad-22.04
     timeout-minutes: 8
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3