Add some gh runners

saltstack · Oct 28, 2024 · 6759191 · 6759191
1 parent fd7b0dc
commit 6759191
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 110 deletions.
diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
@@ -51,9 +51,7 @@ jobs:
           - x86_64
           - arm64
     runs-on:
-      - self-hosted
-      - linux
-      - ${{ matrix.arch }}
+      - linux-${{ matrix.arch }}
     steps:
 
       - name: "Throttle Builds"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2017,9 +2017,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2120,9 +2118,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2251,9 +2247,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2429,9 +2423,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2533,9 +2525,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2626,9 +2616,7 @@ jobs:
     name: Build Repository
     environment: nightly
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2755,9 +2743,7 @@ jobs:
     name: Publish Repositories
     if: ${{ always() && ! failure() && ! cancelled() }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-nightly
+      - linux-x86_64
     environment: nightly
     needs:
       - prepare-workflow

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,9 +49,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     environment: release
@@ -124,9 +122,7 @@ jobs:
   download-onedir-artifact:
     name: Download Staging Onedir Artifact
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     environment: release
@@ -190,9 +186,7 @@ jobs:
   backup:
     name: Backup
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux-x86_64
     needs:
       - prepare-workflow
     env:
@@ -223,9 +217,7 @@ jobs:
   publish-repositories:
     name: Publish Repositories
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux_x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -279,9 +271,7 @@ jobs:
     name: Release v${{ needs.prepare-workflow.outputs.salt-version }}
     if: ${{ always() && ! failure() && ! cancelled() }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -395,9 +385,7 @@ jobs:
       - release
     environment: release
     runs-on:
-      - self-hosted
-      - linux
-      - repo-release
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     steps:

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -309,10 +309,7 @@ jobs:
     name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['prepare-release'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     runs-on:
-      - self-hosted
-      - linux
-      - medium
-      - x86_64
+      - linux-x86_64
     needs:
       - prepare-workflow
     steps:
@@ -2002,9 +1999,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2105,9 +2100,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2236,9 +2229,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2416,9 +2407,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2520,9 +2509,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2613,9 +2600,7 @@ jobs:
     name: Build Repository
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -2742,9 +2727,7 @@ jobs:
     name: Publish Repositories
     if: ${{ always() && ! failure() && ! cancelled() }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     environment: staging
     needs:
       - prepare-workflow
@@ -2802,9 +2785,7 @@ jobs:
       - build-src-repo
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     steps:
       - uses: actions/checkout@v4
 
@@ -2954,9 +2935,7 @@ jobs:
       - pkg-download-tests
     environment: staging
     runs-on:
-      - self-hosted
-      - linux
-      - repo-staging
+      - linux-x86_64
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja
@@ -14,9 +14,7 @@
     name: Build Repository
     environment: <{ gh_environment }>
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:

diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
@@ -61,10 +61,7 @@
     <%- if prepare_actual_release %>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     runs-on:
-      - self-hosted
-      - linux
-      - medium
-      - x86_64
+      - linux-x86_64
     <%- else %>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     runs-on: ubuntu-latest

diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja
@@ -65,9 +65,7 @@ concurrency:
     name: Publish Repositories
     if: ${{ always() && ! failure() && ! cancelled() }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     environment: <{ gh_environment }>
     needs:
       - prepare-workflow

diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja
@@ -71,9 +71,7 @@ permissions:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     environment: <{ gh_environment }>
@@ -156,9 +154,7 @@ permissions:
   download-onedir-artifact:
     name: Download Staging Onedir Artifact
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     environment: <{ gh_environment }>
@@ -211,9 +207,7 @@ permissions:
   backup:
     name: Backup
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     needs:
       - prepare-workflow
     env:
@@ -245,9 +239,7 @@ permissions:
     <%- do conclusion_needs.append('publish-repositories') %>
     name: Publish Repositories
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux_x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -286,9 +278,7 @@ permissions:
     name: Release v${{ needs.prepare-workflow.outputs.salt-version }}
     if: ${{ always() && ! failure() && ! cancelled() }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -402,9 +392,7 @@ permissions:
     name: Restore Release Bucket From Backup
     if: ${{ always() && needs.backup.outputs.backup-complete == 'true' && (failure() || cancelled()) }}
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     needs:
@@ -445,9 +433,7 @@ permissions:
       - restore #}
     environment: <{ gh_environment }>
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     env:
       USE_S3_CACHE: 'true'
     steps:

diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja
@@ -89,9 +89,7 @@ concurrency:
       - build-src-repo
     environment: <{ gh_environment }>
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     steps:
       - uses: actions/checkout@v4
 
@@ -174,9 +172,7 @@ concurrency:
       <%- endfor %>
     environment: <{ gh_environment }>
     runs-on:
-      - self-hosted
-      - linux
-      - repo-<{ gh_environment }>
+      - linux-x86_64
     steps:
       - uses: actions/checkout@v4