Merge pull request #22050 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2

[automated] Merge branch 'release/2.1' => 'release/2.2'

Author: wtgodbe

perf.groovy

@@ -6,6 +6,7 @@ def project = GithubProject
 def branch = GithubBranchName
 def projectName = Utilities.getFolderName(project)
 def projectFolder = projectName + '/' + Utilities.getFolderName(branch)
+def branchFolder = Utilities.getFolderName(branch)
 
 def static getOSGroup(def os) {
     def osGroupMap = ['Ubuntu14.04':'Linux',
@@ -334,7 +335,7 @@ def static getFullPerfJobName(def project, def os, def isPR) {
             def runXUnitCommonArgs = "-arch ${architecture} -os ${os} -configuration ${configuration} -stabilityPrefix \"taskset 0x00000002 nice --adjustment=-10\" -generateBenchviewData \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools\" ${uploadString} -runtype ${runType} -outputdir \"\${WORKSPACE}/bin/sandbox_logs\""
 
             steps {
-                shell("./tests/scripts/perf-prep.sh --nocorefx")
+                shell("./tests/scripts/perf-prep.sh --nocorefx --branch=${branchFolder}")
                 shell("./init-tools.sh")
                 copyArtifacts(fullBuildJobName) {
                     includePatterns("bin/**")
@@ -473,7 +474,7 @@ def static getFullThroughputJobName(def project, def os, def isPR) {
                 def benchViewName = isPR ? 'coreclr-throughput private \$BenchviewCommitName' : 'coreclr-throughput rolling \$GIT_BRANCH_WITHOUT_ORIGIN \$GIT_COMMIT'
 
                 steps {
-                    shell("bash ./tests/scripts/perf-prep.sh --throughput")
+                    shell("bash ./tests/scripts/perf-prep.sh --throughput --branch=${branchFolder}")
                     shell("./init-tools.sh")
                     copyArtifacts(fullBuildJobName) {
                         includePatterns("bin/Product/**")

tests/scripts/perf-prep.sh

@@ -7,7 +7,7 @@ function print_usage {
     echo 'Typical command line:'
     echo ''
     echo 'coreclr/tests/scripts/perf-perp.sh'
-    echo '    --branch="dotnet_coreclr"'
+    echo '    --repo="dotnet_coreclr"'
     echo ''
     echo 'Required arguments:'
     echo '  --branch=<path>             : branch where coreclr/corefx/test bits are copied from (e.g. dotnet_coreclr).'
@@ -21,7 +21,8 @@ readonly EXIT_CODE_SUCCESS=0       # Script ran normally.
 # Argument variables
 perfArch="x64"
 perfConfig="Release"
-perfBranch=
+perfBranch="master"
+perfRepo=
 throughput=0
 nocorefx=0
 
@@ -32,6 +33,9 @@ do
             print_usage
             exit $EXIT_CODE_SUCCESS
             ;;
+        --repo=*)
+            perfRepo=${i#*=}
+            ;;
         --branch=*)
             perfBranch=${i#*=}
             ;;
@@ -49,7 +53,8 @@ do
     esac
 done
 
-perfBranch="dotnet_coreclr"
+perfRepo="dotnet_coreclr"
+echo "repo = $perfRepo"
 echo "branch = $perfBranch"
 echo "architecture = $perfArch"
 echo "configuration = $perfConfig"
@@ -108,7 +113,7 @@ else
 
     if [ ! -d "bin/tests/Windows_NT.$perfArch.$perfConfig" ]; then
         echo "Downloading tests"
-        curl https://ci.dot.net/job/$perfBranch/job/master/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip
+        curl https://ci.dot.net/job/$perfRepo/job/$perfBranch/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip
         echo "unzip tests to ./bin/tests/Windows_NT.$perfArch.$perfConfig"
         unzip -q -o tests.zip -d ./bin/tests/Windows_NT.$perfArch.$perfConfig || exit 0
     fi