From 2dae8de703a6abf7267a14c5f8eb4dc1bc734a47 Mon Sep 17 00:00:00 2001 From: Vault Automation Date: Thu, 9 Apr 2026 08:40:37 -0600 Subject: [PATCH] ci: use os=ubuntu label for linux/amd64 on-demand runners (#13795) (#13806) (#13809) Signed-off-by: Ryan Cragun Co-authored-by: Ryan Cragun --- .github/actionlint.yml | 2 +- .github/actions/metadata/action.yml | 8 ++++---- .github/workflows/security-scan.yml | 2 +- .github/workflows/test-enos-scenario-ui.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actionlint.yml b/.github/actionlint.yml index f7de8fab67..b1f3ccdb1c 100644 --- a/.github/actionlint.yml +++ b/.github/actionlint.yml @@ -10,7 +10,7 @@ self-hosted-runner: - xlarge - ondemand - disk_gb=64 - - os=linux + - os=ubuntu - os=ubuntu-arm - type=m5.2xlarge - type=m6a.8xlarge diff --git a/.github/actions/metadata/action.yml b/.github/actions/metadata/action.yml index e5af64b27b..4c67f45c99 100644 --- a/.github/actions/metadata/action.yml +++ b/.github/actions/metadata/action.yml @@ -168,10 +168,10 @@ runs: go_tags='ent,enterprise' version_metadata='${{ inputs.vault-version }}+ent' fi - compute_build='["self-hosted","ondemand","os=linux","disk_gb=64","type=c6a.4xlarge;c6i.4xlarge;c5a.4xlarge;c5.4xlarge;m7a.4xlarge;m6i.4xlarge;m6a.4xlarge;m5a.4xlarge;m5.4xlarge"]' - compute_build_ui='["self-hosted","ondemand","os=linux","disk_gb=64","type=c6a.2xlarge;c6i.2xlarge;c5a.2xlarge;c5.2xlarge;m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' - compute_test_go='["self-hosted","ondemand","os=linux","disk_gb=64","type=c6a.2xlarge;c6i.2xlarge;c5a.2xlarge;c5.2xlarge;m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' - compute_test_ui='["self-hosted","ondemand","os=linux","disk_gb=64","type=m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' + compute_build='["self-hosted","ondemand","os=ubuntu","disk_gb=64","type=c6a.4xlarge;c6i.4xlarge;c5a.4xlarge;c5.4xlarge;m7a.4xlarge;m6i.4xlarge;m6a.4xlarge;m5a.4xlarge;m5.4xlarge"]' + compute_build_ui='["self-hosted","ondemand","os=ubuntu","disk_gb=64","type=c6a.2xlarge;c6i.2xlarge;c5a.2xlarge;c5.2xlarge;m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' + compute_test_go='["self-hosted","ondemand","os=ubuntu","disk_gb=64","type=c6a.2xlarge;c6i.2xlarge;c5a.2xlarge;c5.2xlarge;m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' + compute_test_ui='["self-hosted","ondemand","os=ubuntu","disk_gb=64","type=m7a.2xlarge;m6i.2xlarge;m6a.2xlarge;m5a.2xlarge;m5.2xlarge"]' compute_small='["self-hosted","linux","small"]' else compute_build='"custom-linux-medium-vault-latest"' diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index 79f6ed10a6..50c14b2b88 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -16,7 +16,7 @@ on: jobs: scan: - runs-on: ${{ github.repository == 'hashicorp/vault' && 'ubuntu-latest' || fromJSON('["self-hosted","ondemand","os=linux","type=c6a.4xlarge;c6i.4xlarge;c5a.4xlarge;c5.4xlarge;m7a.4xlarge;m6i.4xlarge;m6a.4xlarge;m5a.4xlarge;m5.4xlarge"]') }} + runs-on: ${{ github.repository == 'hashicorp/vault' && 'ubuntu-latest' || fromJSON('["self-hosted","ondemand","os=ubuntu","type=c6a.4xlarge;c6i.4xlarge;c5a.4xlarge;c5.4xlarge;m7a.4xlarge;m6i.4xlarge;m6a.4xlarge;m5a.4xlarge;m5.4xlarge"]') }} # The first check ensures this doesn't run on community-contributed PRs, who won't have the # permissions to run this job. if: | diff --git a/.github/workflows/test-enos-scenario-ui.yml b/.github/workflows/test-enos-scenario-ui.yml index 05e0325d7e..14a2e3e4c7 100644 --- a/.github/workflows/test-enos-scenario-ui.yml +++ b/.github/workflows/test-enos-scenario-ui.yml @@ -48,7 +48,7 @@ jobs: - id: get-outputs run: | if [[ '${{ steps.metadata.outputs.is-ent-repo }}' == 'true' ]]; then - echo "runs-on=['self-hosted', 'ondemand', 'os=linux', 'type=m8a.4xlarge;m7a.4xlarge;m5d.4xlarge']" >> "$GITHUB_OUTPUT" + echo "runs-on=['self-hosted', 'ondemand', 'os=ubuntu', 'type=m8a.4xlarge;m7a.4xlarge;m5d.4xlarge']" >> "$GITHUB_OUTPUT" else echo "runs-on=\"custom-linux-xl-vault-latest\"" >> "$GITHUB_OUTPUT" fi