Skip to content

Commit ef15d0d

Browse files
ludfjigludfjig
authored
Try fix 1ES runners (#1353)
* Try fix 1ES runners Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com> * Fix collisions Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com> --------- Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com>
1 parent ced010b commit ef15d0d

11 files changed

Lines changed: 32 additions & 17 deletions

‎.github/workflows/CargoPublish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222

2323
jobs:
2424
publish-hyperlight-packages:
25-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
25+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd", "JobId=publish-hyperlight-packages-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
2626

2727
if: ${{ startsWith(github.ref, 'refs/heads/release/v') || inputs.dry_run }}
2828

‎.github/workflows/CreateRelease.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
build-rust-ubuntu:
2525
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
2626
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/main' }}
27-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
27+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd", "JobId=build-rust-ubuntu-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
2828
needs: [release-blocker-check]
2929

3030
steps:
@@ -98,7 +98,7 @@ jobs:
9898
publish:
9999
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
100100
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/main' }}
101-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
101+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd", "JobId=create-release-publish-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
102102
needs:
103103
[
104104
build-rust-ubuntu,

‎.github/workflows/RustNightly.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ jobs:
3232
cpu: [amd, intel]
3333
config: [debug, release]
3434
runs-on: ${{ fromJson(
35-
format('["self-hosted", "Linux", "X64", "1ES.Pool=hld-{0}-{1}"]',
35+
format('["self-hosted", "Linux", "X64", "1ES.Pool=hld-{0}-{1}", "JobId=musl-{2}-{3}-{4}-{5}-{6}"]',
3636
matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor,
37-
matrix.cpu)) }}
37+
matrix.cpu,
38+
matrix.config,
39+
github.run_id,
40+
github.run_number,
41+
github.run_attempt)) }}
3842
env:
3943
TARGET_TRIPLE: x86_64-unknown-linux-musl
4044
steps:

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
88
copilot-setup-steps:
99
# run on AMD when the run_id ends in 0,2,4,6,8, Intel when it ends in 1,3,5,7,9 so as not to over use one pool too much
10-
runs-on: ${{ (endsWith(github.run_id, '0') || endsWith(github.run_id, '2') || endsWith(github.run_id, '4') || endsWith(github.run_id, '6') || endsWith(github.run_id, '8')) && fromJSON('["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-amd"]') || fromJSON('["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-intel"]') }}
10+
runs-on: ${{ (endsWith(github.run_id, '0') || endsWith(github.run_id, '2') || endsWith(github.run_id, '4') || endsWith(github.run_id, '6') || endsWith(github.run_id, '8')) && fromJSON(format('["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-amd", "JobId=copilot-setup-steps-{0}-{1}-{2}"]', github.run_id, github.run_number, github.run_attempt)) || fromJSON(format('["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-intel", "JobId=copilot-setup-steps-{0}-{1}-{2}"]', github.run_id, github.run_number, github.run_attempt)) }}
1111

1212
# Set the permissions to the lowest permissions possible needed for your steps.
1313
# Copilot will be given its own token for its operations.

‎.github/workflows/dep_benchmarks.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,13 @@ jobs:
7373
if: ${{ inputs.docs_only == 'false' }}
7474
timeout-minutes: 30
7575
runs-on: ${{ fromJson(
76-
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
76+
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}", "JobId=run-benchmarks-{3}-{4}-{5}"]',
7777
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
7878
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
79-
inputs.cpu)) }}
79+
inputs.cpu,
80+
github.run_id,
81+
github.run_number,
82+
github.run_attempt)) }}
8083
steps:
8184
- uses: actions/checkout@v6
8285

‎.github/workflows/dep_build_guests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
build-guests:
3030
if: ${{ inputs.docs_only == 'false' }}
3131
timeout-minutes: 15
32-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
32+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd", "JobId=build-guests-${{ inputs.config }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
3333
steps:
3434
- uses: actions/checkout@v6
3535

‎.github/workflows/dep_build_test.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ jobs:
3939
if: ${{ inputs.docs_only == 'false' }}
4040
timeout-minutes: 45
4141
runs-on: ${{ fromJson(
42-
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
42+
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}", "JobId=build-and-test-{3}-{4}-{5}-{6}"]',
4343
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
4444
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
45-
inputs.cpu)) }}
45+
inputs.cpu,
46+
inputs.config,
47+
github.run_id,
48+
github.run_number,
49+
github.run_attempt)) }}
4650
steps:
4751
- uses: actions/checkout@v6
4852

‎.github/workflows/dep_code_checks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
linux-checks:
2727
if: ${{ inputs.docs_only == 'false' }}
2828
timeout-minutes: 30
29-
runs-on: ["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-amd"]
29+
runs-on: ["self-hosted", "Linux", "X64", "1ES.Pool=hld-kvm-amd", "JobId=linux-checks-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
3030
steps:
3131
- uses: actions/checkout@v6
3232

@@ -98,7 +98,7 @@ jobs:
9898
windows-checks:
9999
if: ${{ inputs.docs_only == 'false' }}
100100
timeout-minutes: 30
101-
runs-on: ["self-hosted", "Windows", "X64", "1ES.Pool=hld-win2025-amd"]
101+
runs-on: ["self-hosted", "Windows", "X64", "1ES.Pool=hld-win2025-amd", "JobId=windows-checks-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"]
102102
steps:
103103
- uses: actions/checkout@v6
104104

‎.github/workflows/dep_fuzzing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ permissions:
2323
jobs:
2424
fuzz:
2525
if: ${{ inputs.docs_only == 'false' }}
26-
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd" ]
26+
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd", "JobId=fuzz-${{ matrix.target }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
2727
strategy:
2828
matrix:
2929
target: ${{ fromJson(inputs.targets) }}

‎.github/workflows/dep_run_examples.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ jobs:
3939
if: ${{ inputs.docs_only == 'false' }}
4040
timeout-minutes: 15
4141
runs-on: ${{ fromJson(
42-
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
42+
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}", "JobId=run-examples-{3}-{4}-{5}-{6}"]',
4343
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
4444
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
45-
inputs.cpu)) }}
45+
inputs.cpu,
46+
inputs.config,
47+
github.run_id,
48+
github.run_number,
49+
github.run_attempt)) }}
4650
steps:
4751
- uses: actions/checkout@v6
4852

0 commit comments

Comments
 (0)