diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-01-29 17:17:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 17:17:18 -0800 |
| commit | ab30991acb30b9f26d1a4297d3b59baa45eb8155 (patch) | |
| tree | 2851a785db86379e8292a4632399b9a80ab600f4 /eng/test-job.yml | |
| parent | 25345fd1e070fdda233a43b7be070d66f187c557 (diff) | |
| download | coreclr-ab30991acb30b9f26d1a4297d3b59baa45eb8155.tar.gz coreclr-ab30991acb30b9f26d1a4297d3b59baa45eb8155.tar.bz2 coreclr-ab30991acb30b9f26d1a4297d3b59baa45eb8155.zip | |
RunCrossGen in ReadyToRun tests, set TimeoutPerTest, set FailOnWorkItemFailure (#22261)
* For ReadyToRun tests in AzDO set RunCrossGen=true during Helix test running
* Set __TestTimeout and introduce TimeoutPerTestInMinutes for test jobs
* Set FailOnWorkItemFailure - fail the AzDO step on Helix work item "catastrophic failure"
Diffstat (limited to 'eng/test-job.yml')
| -rw-r--r-- | eng/test-job.yml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/eng/test-job.yml b/eng/test-job.yml index d5a0a7fad1..a44acca5cd 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -4,10 +4,11 @@ parameters: osGroup: '' osIdentifier: '' priority: 0 - crossgen: false + readyToRun: false scenarios: '' helixQueues: '' timeoutInMinutes: '' + timeoutPerTestInMinutes: '' crossrootfsDir: '' ### Test job @@ -24,18 +25,18 @@ jobs: osIdentifier: ${{ parameters.osIdentifier }} # Compute job name from template parameters - ${{ if eq(parameters.crossgen, 'false') }}: + ${{ if eq(parameters.readyToRun, false) }}: name: ${{ format('testbuild_pri{0}_{1}_{2}_{3}', parameters.priority, parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} displayName: ${{ format('Test Pri{0} {1} {2} {3}', parameters.priority, parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} - ${{ if eq(parameters.crossgen, 'true') }}: + ${{ if eq(parameters.readyToRun, true) }}: name: ${{ format('testbuild_pri{0}_r2r_{1}_{2}_{3}', parameters.priority, parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} displayName: ${{ format('Test Pri{0} R2R {1} {2} {3}', parameters.priority, parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} crossrootfsDir: ${{ parameters.crossrootfsDir }} - ${{ if eq(parameters.crossgen, 'false') }}: + ${{ if eq(parameters.readyToRun, false) }}: helixType: ${{ format('test/functional/cli/pri{0}', parameters.priority) }} - ${{ if eq(parameters.crossgen, 'true') }}: + ${{ if eq(parameters.readyToRun, true) }}: helixType: ${{ format('test/functional/r2r/cli/pri{0}', parameters.priority) }} variables: @@ -52,17 +53,17 @@ jobs: - name: priorityArg value: '' - - ${{ if eq(parameters.crossgen, 'true') }}: + - ${{ if eq(parameters.readyToRun, true) }}: - name: crossgenArg value: 'crossgen' - - ${{ if eq(parameters.crossgen, 'false') }}: + - ${{ if eq(parameters.readyToRun, false) }}: - name: crossgenArg value: '' # TODO: Enable crossgen in build-test.sh. It currently doesn't # accept a crossgen arg, so disable the macos/linux crossgen test # build jobs. - ${{ if and(eq(parameters.crossgen, 'true'), in(parameters.osGroup, 'Linux', 'OSX')) }}: + ${{ if and(eq(parameters.readyToRun, true), in(parameters.osGroup, 'Linux', 'OSX')) }}: condition: false # FreeBSD test jobs are disabled since we don't have any FreeBSD helix queues. @@ -128,9 +129,10 @@ jobs: condition: false publishTestResults: true - # TODO: see if this amount is enough for all individual jobs to finish - # TODO: consider passing this value as a parameter to a test job - timeoutInMinutes: 30 + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + timeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }} + + readyToRun: ${{ parameters.readyToRun }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: # Access token variable for internal project from the |