diff options
| author | Victor Nate Graf <vigraf@microsoft.com> | 2017-11-16 03:24:06 +0300 |
|---|---|---|
| committer | Victor Nate Graf <vigraf@microsoft.com> | 2017-11-16 03:24:06 +0300 |
| commit | 8ee6cbc6961f6a7c4be4a275870f58a06ebc4425 (patch) | |
| tree | 8031caf203a17958f0c10bd0f9a7543eb53b3e3e /perf.groovy | |
| parent | 519c1c9002d3aeb83a5d956f2e46e4c50c632ab7 (diff) | |
| parent | aeda0b030144b478d82e245e39d2a4acb022c501 (diff) | |
Merge branch 'master' of https://github.com/dotnet/corefx into new-performance-machines
Diffstat (limited to 'perf.groovy')
| -rw-r--r-- | perf.groovy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perf.groovy b/perf.groovy index 017896451d..cfc2ec1d3f 100644 --- a/perf.groovy +++ b/perf.groovy @@ -55,7 +55,7 @@ def osShortName = ['Windows 10': 'win10', def newJob = job(Utilities.getFullJobName(project, newJobName, isPR)) { if (os == 'Windows_NT') { - label('windows_clr_perf') + label('windows_server_2016_clr_perf') } else { label('ubuntu_1604_clr_perf') @@ -92,7 +92,7 @@ def osShortName = ['Windows 10': 'win10', //Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView //we have to do it all as one statement because cmd is called each time and we lose the set environment variable batchFile("if [%GIT_BRANCH:~0,7%] == [origin/] (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH:origin/=%) else (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH%)\n" + - "py \"%WORKSPACE%\\Tools\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name " + "\"" + benchViewName + "\"" + " --user " + "\"dotnet-bot@microsoft.com\"\n" + + "py \"%WORKSPACE%\\Tools\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name " + "\"" + benchViewName + "\"" + " --user-email " + "\"dotnet-bot@microsoft.com\"\n" + "py \"%WORKSPACE%\\Tools\\Microsoft.BenchView.JSONFormat\\tools\\build.py\" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type " + runType) batchFile("py \"%WORKSPACE%\\Tools\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\"") batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && build-managed.cmd -release -tests -- /p:Performance=true /p:TargetOS=${osGroup} /m:1 /p:LogToBenchview=true /p:BenchviewRunType=${runType}") @@ -110,7 +110,7 @@ def osShortName = ['Windows 10': 'win10', //Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView //we have to do it all as one statement because cmd is called each time and we lose the set environment variable shell("GIT_BRANCH_WITHOUT_ORIGIN=\$(echo \$GIT_BRANCH | sed \"s/[^/]*\\/\\(.*\\)/\\1 /\")\n" + - "python3.5 \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat/tools/submission-metadata.py\" --name " + "\"" + benchViewName + "\"" + " --user " + "\"dotnet-bot@microsoft.com\"\n" + + "python3.5 \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat/tools/submission-metadata.py\" --name " + "\"" + benchViewName + "\"" + " --user-email " + "\"dotnet-bot@microsoft.com\"\n" + "python3.5 \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat/tools/build.py\" git --branch \$GIT_BRANCH_WITHOUT_ORIGIN --type " + runType) shell("python3.5 \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat/tools/machinedata.py\"") shell("sudo -E bash ./build-managed.sh -release -tests -- /p:Performance=true /p:TargetOS=${osGroup} /m:1 /p:LogToBenchview=true /p:BenchviewRunType=${runType}") |