Merge in 'release/1.1.0' changes

dotnet · Jan 6, 2018 · f55fcd9 · f55fcd9
2 parents fd6a206 + b3726a6
commit f55fcd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -2,13 +2,13 @@
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
     <CoreFxCurrentRef>ea29e3970a903ae3d03d3d4494abe9bf86f7c3a6</CoreFxCurrentRef>
-    <CoreClrCurrentRef>df827dba66e96b0f5b665eb2f97208026afb8ac5</CoreClrCurrentRef>
+    <CoreClrCurrentRef>c5e466924640bf26f247e7f373a8953944077ff5</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
     <CoreFxExpectedPrerelease>servicing-25920-03</CoreFxExpectedPrerelease>
-    <CoreClrExpectedPrerelease>servicing-25730-01</CoreClrExpectedPrerelease>
+    <CoreClrExpectedPrerelease>stable</CoreClrExpectedPrerelease>
     <ExternalExpectedPrerelease>rc3-24214-00</ExternalExpectedPrerelease>
   </PropertyGroup>
 

diff --git a/perf.groovy b/perf.groovy
@@ -49,7 +49,7 @@ def osShortName = ['Windows 10': 'win10',
 // **************************
 [true, false].each { isPR ->
     ['Release'].each { configurationGroup ->
-        ['Windows_NT', 'Ubuntu14.04'].each { os ->
+        ['Windows_NT', 'Ubuntu16.04'].each { os ->
             def osGroup = osGroupMap[os]
             def newJobName = "perf_${os.toLowerCase()}_${configurationGroup.toLowerCase()}"
 
@@ -58,7 +58,7 @@ def osShortName = ['Windows 10': 'win10',
                     label('windows_server_2016_clr_perf')
                 }
                 else {
-                    label('linux_clr_perf')
+                    label('ubuntu_1604_clr_perf')
                 }
 
                 wrappers {
@@ -103,7 +103,7 @@ def osShortName = ['Windows 10': 'win10',
                     steps {
                         //We need to specify the max cpu count to be one as we do not want to be executing performance tests in parallel
                         shell("./build.sh -release")
-                        shell("sudo find . -type f -name dotnet | xargs chmod +x")
+                        shell("find . -type f -name dotnet | xargs chmod u+x")
                         shell("curl \"http://benchviewtestfeed.azurewebsites.net/nuget/FindPackagesById()?id='Microsoft.BenchView.JSONFormat'\" | grep \"content type\" | sed \"\$ s/.*src=\\\"\\([^\\\"]*\\)\\\".*/\\1/;tx;d;:x\" | xargs curl -o benchview.zip")
                         shell("unzip -q -o benchview.zip -d \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat\"")
 
@@ -113,7 +113,7 @@ def osShortName = ['Windows 10': 'win10',
                         "python3.5 \"\${WORKSPACE}/Tools/Microsoft.BenchView.JSONFormat/tools/submission-metadata.py\" --name " + "\"" + benchViewName + "\"" + " --user-email " + "\"[email protected]\"\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}")
+                        shell("bash ./build-managed.sh -release -tests -- /p:Performance=true /p:TargetOS=${osGroup} /m:1 /p:LogToBenchview=true /p:BenchviewRunType=${runType}")
                     }
                 }
             }