Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add JobId to matrix generation #39975

Closed
wants to merge 5 commits into from
Closed

Add JobId to matrix generation #39975

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f5585a
Add JobId to matrix generation
weshaggard Apr 30, 2024
174be5a
Update live.tests.yml
weshaggard Apr 30, 2024
7631fb3
Update native.live.tests.yml
weshaggard Apr 30, 2024
43060e8
Update ci.tests.yml
weshaggard Apr 30, 2024
4911a8d
Update eng/pipelines/templates/jobs/live.tests.yml
weshaggard Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/common/pipelines/templates/jobs/generate-job-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ jobs:
parameters:
UsePlatformContainer: false
OSName: ${{ pool.os }}
JobId: ${{ config.Name }}_${{ pool.os }}
Matrix: dependencies.${{ parameters.GenerateJobName }}.outputs['vm_job_matrix_${{ config.Name }}_${{ pool.name }}.matrix']
DependsOn: ${{ parameters.GenerateJobName }}
CloudConfig: ${{ parameters.CloudConfig }}
Expand All @@ -133,6 +134,7 @@ jobs:
parameters:
UsePlatformContainer: true
OSName: ${{ pool.os }}
JobId: ${{ config.Name }}_${{ pool.os }}
Matrix: dependencies.${{ parameters.GenerateJobName }}.outputs['vm_job_matrix_${{ config.Name }}_${{ pool.name }}.matrix']
DependsOn: ${{ parameters.GenerateJobName }}
CloudConfig: ${{ parameters.CloudConfig }}
Expand Down
4 changes: 3 additions & 1 deletion eng/pipelines/templates/jobs/ci.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ parameters:
default: ''
- name: OSName
type: string
- name: JobId
type: string
- name: TimeoutInMinutes
type: number
default: 60

jobs:
- job: Test_${{ parameters.OSName }}
- job: ${{ parameters.JobId }}
displayName: 'Test'
dependsOn:
- ${{ parameters.DependsOn }}
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/templates/jobs/live.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ parameters:
TestVersionSupport: $(TestVersionSupport)
UseHttpFaultInjector: false
OSName:
JobId:

jobs:
- job: LiveTest_${{ parameters.OSName }}
- job: ${{ parameters.JobId }}
weshaggard marked this conversation as resolved.
Show resolved Hide resolved
dependsOn: ${{ parameters.DependsOn }}
condition: and(succeededOrFailed(), ne(${{ parameters.Matrix }}, '{}'))
strategy:
Expand Down
4 changes: 3 additions & 1 deletion eng/pipelines/templates/jobs/native.live.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ parameters:
default: $(TestVersionSupport)
- name: OSName
type: string
- name: JobId
type: string

jobs:
- job: NativeLiveTest_${{ parameters.OSName }}
- job: ${{ parameters.JobId }}
dependsOn: ${{ parameters.DependsOn }}
condition: and(succeededOrFailed(), ne(${{ parameters.Matrix }}, '{}'))
strategy:
Expand Down