Skip to content

Commit

Permalink
Merge pull request dotnet/coreclr#8510 from DrewScoggins/CommitNameFix
Browse files Browse the repository at this point in the history
Add ability to give a name to a manual PR run

When using the PR leg of the Jenkins performance jobs it is now possible to specify a name that will be used when inserting the data into the perf database.

Commit migrated from dotnet/coreclr@83827bc
  • Loading branch information
DrewScoggins authored Dec 13, 2016
2 parents 42d6ebe + 4913626 commit db3088e
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions src/coreclr/perf.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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 <branch> 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

Expand Down Expand Up @@ -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')
Expand All @@ -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 <branch> 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")
Expand Down

0 comments on commit db3088e

Please sign in to comment.