From 491362613a37ae541938b1a1438296d68bc2a54e Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Wed, 7 Dec 2016 16:12:14 -0800 Subject: [PATCH] Add ability to give a name to a PR run Commit migrated from https://github.com/dotnet/coreclr/commit/82ba80a5fd8f300204c15eda73c632ca5568fd88 --- src/coreclr/perf.groovy | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/coreclr/perf.groovy b/src/coreclr/perf.groovy index e33d950..d7eb783 100644 --- a/src/coreclr/perf.groovy +++ b/src/coreclr/perf.groovy @@ -28,9 +28,6 @@ def static getOSGroup(def os) { [true, false].each { isPR -> ['Windows_NT'].each { os -> ['x64'].each { architecture -> - def configuration = 'Release' - def runType = isPR ? 'private' : 'rolling' - def benchViewName = isPR ? 'coreclr private %ghprbPullTitle%' : 'coreclr rolling %GIT_BRANCH_WITHOUT_ORIGIN% %GIT_COMMIT%' def newJob = job(Utilities.getFullJobName(project, "perf_perflab_${os}", isPR)) { // Set the label. label('windows_clr_perf') @@ -40,6 +37,17 @@ def static getOSGroup(def os) { } } + if (isPR) + { + 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 private BenchviewCommitName') + } + } + def configuration = 'Release' + def runType = isPR ? 'private' : 'rolling' + def benchViewName = isPR ? 'coreclr private %BenchviewCommitName%' : 'coreclr rolling %GIT_BRANCH_WITHOUT_ORIGIN% %GIT_COMMIT%' + steps { // Batch @@ -86,11 +94,6 @@ def static getOSGroup(def os) { // Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario [true, false].each { isPR -> ['Ubuntu14.04'].each { os -> - def osGroup = getOSGroup(os) - def architecture = 'x64' - def configuration = 'Release' - def runType = isPR ? 'private' : 'rolling' - def benchViewName = isPR ? 'coreclr private \$ghprbPullTitle' : 'coreclr rolling \$GIT_BRANCH_WITHOUT_ORIGIN \$GIT_COMMIT' def newJob = job(Utilities.getFullJobName(project, "perf_${os}", isPR)) { label('linux_clr_perf') @@ -100,6 +103,19 @@ def static getOSGroup(def os) { } } + if (isPR) + { + 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 private BenchviewCommitName') + } + } + def osGroup = getOSGroup(os) + def architecture = 'x64' + def configuration = 'Release' + def runType = isPR ? 'private' : 'rolling' + def benchViewName = isPR ? 'coreclr private \$BenchviewCommitName' : 'coreclr rolling \$GIT_BRANCH_WITHOUT_ORIGIN \$GIT_COMMIT' + steps { shell("bash ./tests/scripts/perf-prep.sh") shell("./init-tools.sh") -- 2.7.4