summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichelle McDaniel <adiaaida@gmail.com>2019-01-09 12:56:30 -0800
committerGitHub <noreply@github.com>2019-01-09 12:56:30 -0800
commit92daaffee502293162b03f74f923ad6ecf1075a0 (patch)
treeefe3ed4f2362ed5280f29a795bd49146b14ff40b
parent867d7c93ea9dbabfc7262e747ecb3823983606e3 (diff)
downloadcoreclr-92daaffee502293162b03f74f923ad6ecf1075a0.tar.gz
coreclr-92daaffee502293162b03f74f923ad6ecf1075a0.tar.bz2
coreclr-92daaffee502293162b03f74f923ad6ecf1075a0.zip
Fix perf-prep to pass the branch name (#21911)
For the release branches, we need to specify the branch name when pulling down coreclr test artifacts, and not just pull down from master. This change modifies perf-prep.sh to allow us to specify the branch name, which we will then port to the release branches.
-rwxr-xr-xtests/scripts/perf-prep.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/scripts/perf-prep.sh b/tests/scripts/perf-prep.sh
index 08db69b5f5..2916a4b46d 100755
--- a/tests/scripts/perf-prep.sh
+++ b/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#*=}
;;
@@ -52,7 +56,8 @@ do
esac
done
-perfBranch="dotnet_coreclr"
+perfRepo="dotnet_coreclr"
+echo "repo = $perfRepo"
echo "branch = $perfBranch"
echo "architecture = $perfArch"
echo "configuration = $perfConfig"
@@ -116,7 +121,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