From c8c08765b2044792ba72918aaf257b1faa087a85 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 25 Mar 2022 16:03:24 -0400 Subject: [perf] Set job name for the performance jobs (#67124) job.yml uses name instead of displayName to set the job's name. But perf jobs don't set that. Without this, pre-defined variables like System.PhaseName get value Job1. This will help with differentiating builds in kusto. --- eng/pipelines/coreclr/templates/perf-job.yml | 6 ++++++ eng/pipelines/coreclr/templates/run-performance-job.yml | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'eng') diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 9467c4ed9c8..e6e23c2c892 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -49,6 +49,12 @@ jobs: pgoRunType: ${{ parameters.pgoRunType }} javascriptEngine: ${{ parameters.javascriptEngine }} iosLlvmBuild: ${{ parameters.iosLlvmBuild }} + + ${{ if and(eq(parameters.runtimeType, 'wasm'), eq(parameters.codeGenType, 'aot')) }}: + helixTypeSuffix: '/wasm/aot' + ${{ if and(eq(parameters.runtimeType, 'wasm'), ne(parameters.codeGenType, 'aot')) }}: + helixTypeSuffix: '/wasm' + # Test job depends on the corresponding build job dependsOn: - ${{ if not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'wasm')) }}: diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index 2af9a924b64..77e748df18f 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -23,6 +23,7 @@ parameters: runKind: '' # required -- test category logicalMachine: '' # required -- Used to specify a which pool of machines the test should run against javascriptEngine: 'NoJS' + helixTypeSuffix: '' # optional -- appends to HelixType jobs: - template: xplat-pipeline-job.yml @@ -41,6 +42,7 @@ jobs: displayName: '${{ parameters.displayName }}' ${{ if eq(parameters.displayName, '') }}: displayName: '${{ parameters.jobName }}' + name: ${{ replace(replace(parameters.jobName, ' ', '_'), '-', '_') }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} @@ -131,7 +133,7 @@ jobs: - template: /eng/pipelines/coreclr/templates/perf-send-to-helix.yml parameters: HelixSource: '$(HelixSourcePrefix)/$(Build.Repository.Name)/$(Build.SourceBranch)' # sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'test/performance/$(Kind)/$(_Framework)/$(Architecture)' + HelixType: 'test/performance/$(Kind)/$(_Framework)/$(Architecture)${{ parameters.helixTypeSuffix }}' HelixAccessToken: $(HelixApiAccessToken) HelixTargetQueues: $(Queue) HelixPreCommands: $(HelixPreCommand) -- cgit v1.2.3