diff options
Diffstat (limited to 'perf.groovy')
| -rw-r--r-- | perf.groovy | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/perf.groovy b/perf.groovy index d7eb783cb9..1eb9f19525 100644 --- a/perf.groovy +++ b/perf.groovy @@ -27,8 +27,8 @@ def static getOSGroup(def os) { // Setup perflab tests runs [true, false].each { isPR -> ['Windows_NT'].each { os -> - ['x64'].each { architecture -> - def newJob = job(Utilities.getFullJobName(project, "perf_perflab_${os}", isPR)) { + ['x64', 'x86'].each { architecture -> + def newJob = job(Utilities.getFullJobName(project, "perf_perflab_${os}_${architecture}", isPR)) { // Set the label. label('windows_clr_perf') wrappers { @@ -41,7 +41,7 @@ def static getOSGroup(def os) { { parameters { - stringParam('BenchviewCommitName', '%ghprbPullTitle%', 'The name that you will be used to build the full title of a run in Benchview. The final name will be of the form <branch> private BenchviewCommitName') + stringParam('BenchviewCommitName', '\${ghprbPullTitle}', 'The name that you will be used to build the full title of a run in Benchview. The final name will be of the form <branch> private BenchviewCommitName') } } def configuration = 'Release' @@ -76,9 +76,9 @@ def static getOSGroup(def os) { if (isPR) { TriggerBuilder builder = TriggerBuilder.triggerOnPullRequest() - builder.setGithubContext("${os} CoreCLR Perf Tests") + builder.setGithubContext("${os} ${architecture} CoreCLR Perf Tests") builder.triggerOnlyOnComment() - builder.setCustomTriggerPhrase("(?i).*test\\W+${os}\\W+perf.*") + builder.setCustomTriggerPhrase("(?i).*test\\W+${os}_${architecture}\\W+perf.*") builder.triggerForBranch(branch) builder.emitTrigger(newJob) } @@ -107,7 +107,7 @@ def static getOSGroup(def os) { { parameters { - stringParam('BenchviewCommitName', '\$ghprbPullTitle', 'The name that you will be used to build the full title of a run in Benchview. The final name will be of the form <branch> private BenchviewCommitName') + stringParam('BenchviewCommitName', '\${ghprbPullTitle}', 'The name that you will be used to build the full title of a run in Benchview. The final name will be of the form <branch> private BenchviewCommitName') } } def osGroup = getOSGroup(os) @@ -128,8 +128,7 @@ def static getOSGroup(def os) { --testNativeBinDir=\"\${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration}/tests\" \\ --coreClrBinDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ --mscorlibDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ - --coreFxBinDir=\"\${WORKSPACE}/corefx/bin/${osGroup}.AnyCPU.${configuration};\${WORKSPACE}/corefx/bin/Unix.AnyCPU.${configuration};\${WORKSPACE}/corefx/bin/AnyOS.AnyCPU.${configuration}\" \\ - --coreFxNativeBinDir=\"\${WORKSPACE}/corefx/bin/${osGroup}.${architecture}.${configuration}\" \\ + --coreFxBinDir=\"\${WORKSPACE}/corefx\" \\ --runType=\"${runType}\" \\ --benchViewOS=\"${os}\" \\ --uploadToBenchview""") |