Skip to content

Commit 06f6f1c

Browse files
eserscoreserscor
authored
Tag hosted pools with JobId (#26716)
### Description onnxruntime-github-Ubuntu2204-AMD-CPU has been running out of resources. Based on the documentation for self hosted pools, they require a unique identifier set to: JobId=<uniquejobprefix>-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }} This PR adds the above JobID to all instances of self-hosted pool. ### Motivation and Context We are seeing long queue times on the self hosted pools. Reaching out to the pool owners, they recommended adding JobId across all self hosted instances.
1 parent a2c4374 commit 06f6f1c

37 files changed

+261
-52
lines changed

‎.github/workflows/android.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ permissions:
2424

2525
jobs:
2626
AndroidBinarySizeCheckJob_MinimalBaseline:
27-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
27+
runs-on: [
28+
"self-hosted",
29+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
30+
"JobId=AndroidBinarySizeCheckJob_MinimalBaseline-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
31+
]
2832
steps:
2933
- name: Checkout repository
3034
uses: actions/checkout@v6
@@ -66,7 +70,7 @@ jobs:
6670
set_var("BuildConfigOs", config["os"])
6771
shell: python
6872
working-directory: ${{ github.workspace }}
69-
73+
7074
- name: 1a. Build onnxruntime
7175
run: |
7276
set -e -x
@@ -110,7 +114,11 @@ jobs:
110114
shell: bash
111115

112116
android_nnapi_ep:
113-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
117+
runs-on: [
118+
"self-hosted",
119+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
120+
"JobId=android_nnapi_ep-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
121+
]
114122
steps:
115123
- uses: actions/checkout@v6
116124

@@ -185,7 +193,12 @@ jobs:
185193

186194
android_cpu_ep:
187195
name: Android CI Pipeline
188-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
196+
runs-on: [
197+
"self-hosted",
198+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
199+
"JobId=android_cpu_ep-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
200+
]
201+
189202
steps:
190203
- uses: actions/checkout@v6
191204

‎.github/workflows/cffconvert.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ on:
99
jobs:
1010
validate:
1111
name: "validate"
12-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
12+
runs-on: [
13+
"self-hosted",
14+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
15+
"JobId=cffconvert-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
16+
]
1317
steps:
1418
- name: Check out a copy of the repository
1519
uses: actions/checkout@v6

‎.github/workflows/codeql.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ concurrency:
2323
jobs:
2424
analyze:
2525
name: Analyze
26-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
26+
runs-on: [
27+
"self-hosted",
28+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
29+
"JobId=codeql-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
30+
]
2731
permissions:
2832
actions: read
2933
contents: read

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ on:
1313
jobs:
1414
validation:
1515
name: "Validation"
16-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
16+
runs-on: [
17+
"self-hosted",
18+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
19+
"JobId=gradle-wrapper-validation-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
20+
]
1721
steps:
1822
- uses: actions/checkout@v6
1923
- uses: gradle/actions/wrapper-validation@v5

‎.github/workflows/labeler.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ permissions:
88

99
jobs:
1010
triage:
11-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
11+
runs-on: [
12+
"self-hosted",
13+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
14+
"JobId=labeler-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
15+
]
1216
steps:
1317
- uses: github/[email protected]
1418
with:

‎.github/workflows/lint.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ jobs:
3737
lint-python-format:
3838
# Required workflow
3939
name: Python format
40-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
40+
runs-on: [
41+
"self-hosted",
42+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
43+
"JobId=lint-python-format-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
44+
]
4145
permissions:
4246
contents: read
4347
security-events: write
@@ -114,7 +118,11 @@ jobs:
114118

115119
lint-js:
116120
name: Lint JavaScript
117-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
121+
runs-on: [
122+
"self-hosted",
123+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
124+
"JobId=lint-js-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
125+
]
118126
steps:
119127
- uses: actions/checkout@v6
120128
- uses: actions/setup-node@v6

‎.github/workflows/linux-wasm-ci-build-and-test-workflow.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ on:
3434

3535
jobs:
3636
build-wasm:
37-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
37+
runs-on: [
38+
"self-hosted",
39+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
40+
"JobId=build-wasm-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
41+
]
3842
env:
3943
buildArch: x64
4044
common_build_args: >-

‎.github/workflows/linux_ci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
dockerfile_path: tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
4949
docker_image_repo: onnxruntimecpubuildcix64
5050
extra_build_flags: '--enable_address_sanitizer'
51+
job_identifier: build-linux-x64-debug
5152
# python_path_prefix: '' # Default empty string is fine, no prefix needed
5253
secrets:
5354
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -63,6 +64,7 @@ jobs:
6364
docker_image_repo: onnxruntimecpubuildpythonx64
6465
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --build_nuget --enable_transformers_tool_test --cmake_extra_defines onnxruntime_BUILD_BENCHMARKS=ON'
6566
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH' # $ needs escaping in single quotes
67+
job_identifier: build-linux-x64-release
6668
secrets:
6769
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6870

@@ -77,6 +79,7 @@ jobs:
7779
docker_image_repo: onnxruntimecpubuildpythonx64 # Shares image with standard x64 release
7880
extra_build_flags: '--enable_training --use_binskim_compliant_compile_flags --build_wheel --build_nuget --enable_transformers_tool_test --cmake_extra_defines onnxruntime_BUILD_BENCHMARKS=ON'
7981
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH' # $ needs escaping in single quotes
82+
job_identifier: orttraining-linux-ci-pipeline
8083
secrets:
8184
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8285

@@ -92,6 +95,7 @@ jobs:
9295
docker_image_repo: onnxruntimecpubuildciaarch64
9396
# ASan disabled due to excessive runtime (>4hr). Includes wheel build for basic checks.
9497
extra_build_flags: '--use_binskim_compliant_compile_flags --build_shared_lib'
98+
job_identifier: build-linux-arm64-debug
9599
secrets:
96100
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97101

@@ -106,5 +110,6 @@ jobs:
106110
docker_image_repo: onnxruntimecpubuildpythonaarch64
107111
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --cmake_extra_defines onnxruntime_BUILD_BENCHMARKS=ON'
108112
python_path_prefix: 'PATH=/opt/python/cp310-cp310/bin:$PATH' # $ needs escaping in single quotes
113+
job_identifier: build-linux-arm64-release
109114
secrets:
110115
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/linux_cuda_ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
run_tests: false # <<< Do not run tests in this job
3535
upload_build_output: true # <<< Upload the build/Release directory
3636
execution_providers: 'cuda'
37+
job_identifier: build-linux-cuda-x64-release
3738
secrets:
3839
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Pass token for reusable workflow needs (e.g., docker build action)
3940

@@ -43,6 +44,7 @@ jobs:
4344
runs-on:
4445
- self-hosted
4546
- "1ES.Pool=Onnxruntime-github-Linux-GPU-H100"
47+
- "JobId=test-linux-cuda-x64-release-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
4648
permissions:
4749
contents: read
4850
packages: read

‎.github/workflows/linux_minimal_build.yml‎

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ jobs:
2222
# Job 1: Build full onnxruntime and generate ORT format test files
2323
build_full_ort:
2424
name: 1. Build Full ORT and Generate ORT Files
25-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
25+
runs-on: [
26+
"self-hosted",
27+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
28+
"JobId=build_full_ort-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
29+
]
2630
permissions:
2731
contents: read
2832
packages: write
@@ -58,7 +62,11 @@ jobs:
5862
# Job 2: Build minimal onnxruntime [exceptions DISABLED, type reduction DISABLED, training ops ENABLED]
5963
build_minimal_exceptions_disabled:
6064
name: 2. Build Minimal (Exceptions Disabled)
61-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
65+
runs-on: [
66+
"self-hosted",
67+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
68+
"JobId=build_minimal_exceptions_disabled-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
69+
]
6270
permissions: # Permissions needed for build-docker-image
6371
contents: read
6472
packages: write
@@ -115,7 +123,11 @@ jobs:
115123
build_minimal_custom_ops:
116124
name: 3a. Build Minimal (Custom Ops)
117125
needs: build_full_ort # Depends on Job 1 for test data
118-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
126+
runs-on: [
127+
"self-hosted",
128+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
129+
"JobId=build_minimal_custom_ops-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
130+
]
119131
permissions: # Permissions needed for build-docker-image
120132
contents: read
121133
packages: write
@@ -149,7 +161,11 @@ jobs:
149161
build_minimal_type_reduction:
150162
name: 3b. Build Minimal (Type Reduction)
151163
needs: build_full_ort # Depends on Job 1 for test data
152-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
164+
runs-on: [
165+
"self-hosted",
166+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
167+
"JobId=build_minimal_type_reduction-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
168+
]
153169
permissions: # Permissions needed for build-docker-image
154170
contents: read
155171
packages: write
@@ -181,7 +197,11 @@ jobs:
181197
# Job 4: Build minimal onnxruntime [exceptions ENABLED, type reduction ENABLED (globally allowed types)] and run tests
182198
build_minimal_globally_allowed_types:
183199
name: 4. Build Minimal (Globally Allowed Types)
184-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
200+
runs-on: [
201+
"self-hosted",
202+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
203+
"JobId=build_minimal_globally_allowed_types-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
204+
]
185205
permissions: # Permissions needed for build-docker-image
186206
contents: read
187207
packages: write
@@ -215,7 +235,11 @@ jobs:
215235
# Job 5: Build extended minimal onnxruntime and run tests
216236
build_extended_minimal:
217237
name: 5. Build Extended Minimal
218-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
238+
runs-on: [
239+
"self-hosted",
240+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
241+
"JobId=build_extended_minimal-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
242+
]
219243
permissions: # Permissions needed for build-docker-image
220244
contents: read
221245
packages: write
@@ -279,7 +303,11 @@ jobs:
279303
# Job 6a: Regular build with python and all optional features disabled.
280304
build_regular_no_optional:
281305
name: 6a. Build Regular (No Optional Features)
282-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
306+
runs-on: [
307+
"self-hosted",
308+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
309+
"JobId=build_regular_no_optional-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
310+
]
283311
permissions: # Permissions needed for build-docker-image
284312
contents: read
285313
packages: write
@@ -356,7 +384,11 @@ jobs:
356384
# Job 6b: Minimal build with all optional features disabled.
357385
build_minimal_no_optional:
358386
name: 6b. Build Minimal (No Optional Features)
359-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
387+
runs-on: [
388+
"self-hosted",
389+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
390+
"JobId=build_minimal_no_optional-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
391+
]
360392
permissions: # Permissions needed for build-docker-image
361393
contents: read
362394
packages: write
@@ -423,7 +455,11 @@ jobs:
423455
# Job 6c: Extended minimal build with all optional features disabled.
424456
build_extended_minimal_no_optional:
425457
name: 6c. Build Extended Minimal (No Optional Features)
426-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
458+
runs-on: [
459+
"self-hosted",
460+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
461+
"JobId=build_extended_minimal_no_optional-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
462+
]
427463
permissions: # Permissions needed for build-docker-image
428464
contents: read
429465
packages: write
@@ -498,7 +534,11 @@ jobs:
498534
build_extended_minimal_android:
499535
name: 7. Build Extended Minimal (Android NNAPI)
500536
needs: build_full_ort # Depends on Job 1 for test data
501-
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
537+
runs-on: [
538+
"self-hosted",
539+
"1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU",
540+
"JobId=build_extended_minimal_android-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
541+
]
502542
permissions: # Permissions needed for build-docker-image
503543
contents: read
504544
packages: write

0 commit comments

Comments
 (0)