Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit da6c2b1

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/1.1.0' changes
2 parents 32daf30 + ff883c0 commit da6c2b1

File tree

1 file changed

+0
-148
lines changed

1 file changed

+0
-148
lines changed

‎perf.groovy‎

Lines changed: 0 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -164,77 +164,6 @@ def static getOSGroup(def os) {
164164
}
165165
}
166166

167-
// Setup throughput perflab tests runs
168-
[true, false].each { isPR ->
169-
['Windows_NT'].each { os ->
170-
['x64', 'x86'].each { arch ->
171-
def architecture = arch
172-
173-
def newJob = job(Utilities.getFullJobName(project, "perf_throughput_perflab_${os}_${arch}", isPR)) {
174-
// Set the label.
175-
label('windows_server_2016_clr_perf')
176-
wrappers {
177-
credentialsBinding {
178-
string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')
179-
}
180-
}
181-
182-
if (isPR)
183-
{
184-
parameters
185-
{
186-
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')
187-
}
188-
}
189-
def configuration = 'Release'
190-
def runType = isPR ? 'private' : 'rolling'
191-
def benchViewName = isPR ? 'coreclr-throughput private %BenchviewCommitName%' : 'coreclr-throughput rolling %GIT_BRANCH_WITHOUT_ORIGIN% %GIT_COMMIT%'
192-
193-
steps {
194-
// Batch
195-
196-
batchFile("if exist \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\" rmdir /s /q \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\"")
197-
batchFile("if exist \"%WORKSPACE%\\Microsoft.BenchView.ThroughputBenchmarks.${architecture}.${os}\" rmdir /s /q \"%WORKSPACE%\\Microsoft.BenchView.ThroughputBenchmarks.${architecture}.${os}\"")
198-
batchFile("C:\\Tools\\nuget.exe install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -OutputDirectory \"%WORKSPACE%\" -Prerelease -ExcludeVersion")
199-
batchFile("C:\\Tools\\nuget.exe install Microsoft.BenchView.ThroughputBenchmarks.${architecture}.${os} -Source https://dotnet.myget.org/F/dotnet-core -OutputDirectory \"%WORKSPACE%\" -Prerelease -ExcludeVersion")
200-
//Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView
201-
//we have to do it all as one statement because cmd is called each time and we lose the set environment variable
202-
batchFile("if \"%GIT_BRANCH:~0,7%\" == \"origin/\" (set \"GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH:origin/=%\") else (set \"GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH%\")\n" +
203-
"set \"BENCHVIEWNAME=${benchViewName}\"\n" +
204-
"set \"BENCHVIEWNAME=%BENCHVIEWNAME:\"=%\"\n" +
205-
"py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"${benchViewName}\" --user-email \"[email protected]\"\n" +
206-
"py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\build.py\" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type ${runType}")
207-
batchFile("py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\"")
208-
batchFile("set __TestIntermediateDir=int&&build.cmd ${configuration} ${architecture} skiptests")
209-
batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly")
210-
batchFile("py -u tests\\scripts\\run-throughput-perf.py -arch ${arch} -os ${os} -configuration ${configuration} -clr_root \"%WORKSPACE%\" -assembly_root \"%WORKSPACE%\\Microsoft.BenchView.ThroughputBenchmarks.${architecture}.${os}\\lib\" -benchview_path \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -run_type ${runType}")
211-
}
212-
}
213-
214-
// Save machinedata.json to /artifact/bin/ Jenkins dir
215-
def archiveSettings = new ArchivalSettings()
216-
archiveSettings.addFiles('throughput-*.csv')
217-
Utilities.addArchival(newJob, archiveSettings)
218-
219-
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
220-
221-
if (isPR) {
222-
TriggerBuilder builder = TriggerBuilder.triggerOnPullRequest()
223-
builder.setGithubContext("${os} ${arch} CoreCLR Throughput Perf Tests")
224-
builder.triggerOnlyOnComment()
225-
builder.setCustomTriggerPhrase("(?i).*test\\W+${os}\\W+${arch}\\W+throughput.*")
226-
builder.triggerForBranch(branch)
227-
builder.emitTrigger(newJob)
228-
}
229-
else {
230-
// Set a push trigger
231-
TriggerBuilder builder = TriggerBuilder.triggerOnCommit()
232-
builder.emitTrigger(newJob)
233-
}
234-
}
235-
}
236-
}
237-
238167
// Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario
239168
[true, false].each { isPR ->
240169
['Ubuntu16.04'].each { os ->
@@ -323,80 +252,3 @@ def static getOSGroup(def os) {
323252
}
324253
} // os
325254
} // isPR
326-
327-
// Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario
328-
[true, false].each { isPR ->
329-
['Ubuntu16.04'].each { os ->
330-
def newJob = job(Utilities.getFullJobName(project, "perf_throughput_${os}", isPR)) {
331-
332-
label('ubuntu_1604_clr_perf')
333-
wrappers {
334-
credentialsBinding {
335-
string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')
336-
}
337-
}
338-
339-
if (isPR)
340-
{
341-
parameters
342-
{
343-
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')
344-
}
345-
}
346-
def osGroup = getOSGroup(os)
347-
def architecture = 'x64'
348-
def configuration = 'Release'
349-
def runType = isPR ? 'private' : 'rolling'
350-
def benchViewName = isPR ? 'coreclr private \$BenchviewCommitName' : 'coreclr rolling \$GIT_BRANCH_WITHOUT_ORIGIN \$GIT_COMMIT'
351-
352-
steps {
353-
shell("bash ./tests/scripts/perf-prep.sh --throughput")
354-
shell("./init-tools.sh")
355-
shell("./build.sh ${architecture} ${configuration}")
356-
shell("GIT_BRANCH_WITHOUT_ORIGIN=\$(echo \$GIT_BRANCH | sed \"s/[^/]*\\/\\(.*\\)/\\1 /\")\n" +
357-
"python3.5 \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools/submission-metadata.py\" --name \" ${benchViewName} \" --user-email \"[email protected]\"\n" +
358-
"python3.5 \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools/build.py\" git --branch \$GIT_BRANCH_WITHOUT_ORIGIN --type ${runType}")
359-
shell("""python3.5 ./tests/scripts/run-throughput-perf.py \\
360-
-arch \"${architecture}\" \\
361-
-os \"${os}\" \\
362-
-configuration \"${configuration}\" \\
363-
-clr_root \"\${WORKSPACE}\" \\
364-
-assembly_root \"\${WORKSPACE}/_/fx/bin/runtime/netcoreapp-${osGroup}-${configuration}-${architecture}\" \\
365-
-run_type \"${runType}\" \\
366-
-benchview_path \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools\"""")
367-
}
368-
}
369-
370-
// Save machinedata.json to /artifact/bin/ Jenkins dir
371-
def archiveSettings = new ArchivalSettings()
372-
archiveSettings.addFiles('throughput-*.csv')
373-
archiveSettings.addFiles('machinedata.json')
374-
Utilities.addArchival(newJob, archiveSettings)
375-
376-
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
377-
378-
// For perf, we need to keep the run results longer
379-
newJob.with {
380-
// Enable the log rotator
381-
logRotator {
382-
artifactDaysToKeep(7)
383-
daysToKeep(300)
384-
artifactNumToKeep(25)
385-
numToKeep(1000)
386-
}
387-
}
388-
if (isPR) {
389-
TriggerBuilder builder = TriggerBuilder.triggerOnPullRequest()
390-
builder.setGithubContext("${os} Throughput Perf Tests")
391-
builder.triggerOnlyOnComment()
392-
builder.setCustomTriggerPhrase("(?i).*test\\W+${os}\\W+throughput.*")
393-
builder.triggerForBranch(branch)
394-
builder.emitTrigger(newJob)
395-
}
396-
else {
397-
// Set a push trigger
398-
TriggerBuilder builder = TriggerBuilder.triggerOnCommit()
399-
builder.emitTrigger(newJob)
400-
}
401-
} // os
402-
} // isPR

0 commit comments

Comments
 (0)