diff options
Diffstat (limited to 'eng/test-job.yml')
| -rw-r--r-- | eng/test-job.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/eng/test-job.yml b/eng/test-job.yml index fe065d150c..bc4e7aad1c 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -27,6 +27,10 @@ jobs: osIdentifier: ${{ parameters.osIdentifier }} helixType: 'build/tests/' + # Test jobs should continue on error for internal builds + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + continueOnError: true + # Compute job name from template parameters ${{ if and(eq(parameters.testGroup, 'innerloop'), eq(parameters.displayNameArgs, '')) }}: name: ${{ format('test_{0}_{1}_{2}_{3}', 'p0', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} @@ -118,13 +122,13 @@ jobs: displayName: Install native dependencies - # Download product build + # Download product binaries directory - task: DownloadBuildArtifacts@0 displayName: Download product build inputs: buildType: current downloadType: single - artifactName: ${{ format('{0}_{1}_{2}_build', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} + artifactName: ${{ format('BinDir_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} downloadPath: $(System.ArtifactsDirectory) @@ -132,7 +136,7 @@ jobs: - task: CopyFiles@2 displayName: Populate Product directory inputs: - sourceFolder: $(System.ArtifactsDirectory)/${{ format('{0}_{1}_{2}_build', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} + sourceFolder: $(System.ArtifactsDirectory)/${{ format('BinDir_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }} contents: '**' targetFolder: $(Build.SourcesDirectory)/bin/Product/$(osGroup).$(archType).$(buildConfigUpper) @@ -323,19 +327,18 @@ jobs: - forcerelocs - gcstress15 - # Publish Logs - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: pathtoPublish: $(Build.SourcesDirectory)/bin/Logs ${{ if and(eq(parameters.corefxTests, true), eq(parameters.readyToRun, true)) }}: - artifactName: ${{ format('test{0}_{1}_{2}_{3}_{4}_Logs', '_r2r_corefx', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} + artifactName: ${{ format('TestLogs_r2r_corefx_{0}_{1}_{2}_{3}', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} ${{ if and(eq(parameters.corefxTests, true), ne(parameters.readyToRun, true)) }}: - artifactName: ${{ format('test{0}_{1}_{2}_{3}_{4}_Logs', '_corefx', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} + artifactName: ${{ format('TestLogs_corefx_{0}_{1}_{2}_{3}', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} ${{ if and(ne(parameters.corefxTests, true), eq(parameters.readyToRun, true)) }}: - artifactName: ${{ format('test{0}_{1}_{2}_{3}_{4}_Logs', '_r2r', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} + artifactName: ${{ format('TestLogs_r2r_{0}_{1}_{2}_{3}', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} ${{ if and(ne(parameters.corefxTests, true), ne(parameters.readyToRun, true)) }}: - artifactName: ${{ format('test{0}_{1}_{2}_{3}_{4}_Logs', '', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} + artifactName: ${{ format('TestLogs_{0}_{1}_{2}_{3}', parameters.osIdentifier, parameters.archType, parameters.buildConfig, parameters.testGroup) }} continueOnError: true condition: always() |