diff options
| author | Drew Scoggins <anscoggi@microsoft.com> | 2021-03-04 20:19:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 20:19:21 +0300 |
| commit | 3eaf1f316b8b1da73fdb98e9cca43c0ddaa12f45 (patch) | |
| tree | c76e9fffcfd0589b6cfbaa80ef781ec3adad0632 | |
| parent | 2f69640274e362fd5f8570aaf455f717b2323118 (diff) | |
[release/6.0-preview2] Turn off LKG calculation (#49075)v6.0.0-preview.2.21154.6
This change moves the performance infrastructure to use
the latest version of dotnet for building and running BDN.
This does not change what bits are tested.
| -rw-r--r-- | eng/common/performance/performance-setup.ps1 | 8 | ||||
| -rwxr-xr-x | eng/common/performance/performance-setup.sh | 10 |
2 files changed, 0 insertions, 18 deletions
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 0edb2ae276e..c6f1045e3d7 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -79,14 +79,6 @@ $CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumb $SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" -#This grabs the LKG version number of dotnet and passes it to our scripts -$VersionJSON = Get-Content global.json | ConvertFrom-Json -$DotNetVersion = $VersionJSON.tools.dotnet -# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 -# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments" -$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments" - - if ($RunFromPerformanceRepo) { $SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments" diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 2fd148fec2f..cd4f233d57e 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -237,16 +237,6 @@ fi common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture" setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" - -if [[ "$use_latest_dotnet" = false ]]; then - # Get the tools section from the global.json. - # This grabs the LKG version number of dotnet and passes it to our scripts - dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'` - # TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 - # setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" - setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments" -fi - if [[ "$run_from_perf_repo" = true ]]; then payload_directory= workitem_directory=$source_directory |