From c523ed794f370420ed3ba12aaf17541adaab14d7 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 2 Sep 2022 22:52:27 +0200 Subject: [PATCH 1/2] fix HttpStress --- .../tests/StressTests/HttpStress/Directory.Build.props | 2 +- .../System.Net.Http/tests/StressTests/HttpStress/Dockerfile | 2 +- .../tests/StressTests/HttpStress/build-local.ps1 | 2 +- .../System.Net.Http/tests/StressTests/HttpStress/build-local.sh | 2 +- .../tests/StressTests/HttpStress/windows.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props index a1d1b3174a394a..fc0727929be447 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props @@ -7,7 +7,7 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, global.json))/ $(RepositoryRoot)eng/targetingpacks.targets - 7.0.0 + 8.0.0 net7.0 7.0 Microsoft.NETCore.App diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index d69c760d327493..93f52003db723d 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -42,5 +42,5 @@ EXPOSE 5001 ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV HTTPSTRESS_ARGS='' -CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec \ +CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ ./bin/$CONFIGURATION/net$VERSION/HttpStress.dll $HTTPSTRESS_ARGS diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 index 077dbdb922591b..2eb73a50b6edfc 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 @@ -56,7 +56,7 @@ dotnet build -c $StressConfiguration $Runscript=".\run-stress-$LibrariesConfiguration-$StressConfiguration.ps1" if (-not (Test-Path $Runscript)) { Write-Host "Generating Runscript." - Add-Content -Path $Runscript -Value "& '$TestHostRoot/dotnet' exec ./bin/$StressConfiguration/net$Version/HttpStress.dll `$args" + Add-Content -Path $Runscript -Value "& '$TestHostRoot/dotnet' exec --roll-forward Major ./bin/$StressConfiguration/net$Version/HttpStress.dll `$args" } Write-Host "To run tests type:" diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh index 9455c31c1ce6b2..cbb3f2bfcedff0 100755 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh @@ -59,7 +59,7 @@ dotnet build -c $stress_configuration runscript=./run-stress-${stress_configuration,,}-${libraries_configuration,,}.sh if [[ ! -f $runscript ]]; then echo "Generating runscript." - echo "$testhost_root/dotnet exec ./bin/$stress_configuration/net$version/HttpStress.dll \$@" > $runscript + echo "$testhost_root/dotnet exec --roll-forward Major ./bin/$stress_configuration/net$version/HttpStress.dll \$@" > $runscript chmod +x $runscript fi diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile index 946baf32b80be7..cb9514502e905b 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile @@ -27,5 +27,5 @@ ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV HTTPSTRESS_ARGS="" -CMD & C:/live-runtime-artifacts/testhost/net$env:VERSION-windows-$env:CONFIGURATION-x64/dotnet.exe exec ` +CMD & C:/live-runtime-artifacts/testhost/net$env:VERSION-windows-$env:CONFIGURATION-x64/dotnet.exe exec --roll-forward Major ` ./bin/$env:CONFIGURATION/net$env:VERSION/HttpStress.dll $env:HTTPSTRESS_ARGS.Split() \ No newline at end of file From 58da3e93c9f821f8308ad435a6d3d4cea8a73618 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Fri, 2 Sep 2022 22:52:48 +0200 Subject: [PATCH 2/2] fix SslStress --- .../tests/StressTests/SslStress/Build-Local.ps1 | 15 ++++++++++++++- .../StressTests/SslStress/Directory.Build.props | 2 +- .../tests/StressTests/SslStress/Dockerfile | 2 +- .../tests/StressTests/SslStress/build-local.sh | 15 ++++++++++++++- .../StressTests/SslStress/windows.Dockerfile | 2 +- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 index dc8ae9b4494094..889d62c073c0ad 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 @@ -34,13 +34,26 @@ if (-not (Test-Path -Path $TestHostRoot)) { exit 1 } +if (-not (Test-Path -Path $DailyDotnetRoot)) { + Write-Host "Downloading daily SDK to: $DailyDotnetRoot" + New-Item -ItemType Directory -Path $DailyDotnetRoot + Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile "$DailyDotnetRoot\dotnet-install.ps1" + & "$DailyDotnetRoot\dotnet-install.ps1" -NoPath -Channel "$Version.1xx" -Quality daily -InstallDir $DailyDotnetRoot +} else { + Write-Host "Daily SDK found in $DailyDotnetRoot" +} + +$env:DOTNET_ROOT=$DailyDotnetRoot +$env:PATH="$DailyDotnetRoot;$env:PATH" +$env:DOTNET_MULTILEVEL_LOOKUP=0 + Write-Host "Building solution." dotnet build -c $StressConfiguration $Runscript=".\run-stress-$LibrariesConfiguration-$StressConfiguration.ps1" if (-not (Test-Path $Runscript)) { Write-Host "Generating Runscript." - Add-Content -Path $Runscript -Value "& '$TestHostRoot/dotnet' exec ./bin/$StressConfiguration/net$Version/SslStress.dll `$args" + Add-Content -Path $Runscript -Value "& '$TestHostRoot/dotnet' exec --roll-forward Major ./bin/$StressConfiguration/net$Version/SslStress.dll `$args" } Write-Host "To run tests type:" diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Directory.Build.props b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Directory.Build.props index 74036484c18dd0..b9590ad89ef16a 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Directory.Build.props +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Directory.Build.props @@ -7,7 +7,7 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, global.json))/ $(RepositoryRoot)eng/targetingpacks.targets - 7.0.0 + 8.0.0 net7.0 7.0 Microsoft.NETCore.App diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile index d47c4c9be1be2c..ae86f7e6fb2937 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile @@ -19,5 +19,5 @@ ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV SSLSTRESS_ARGS='' -CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec \ +CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ ./bin/$CONFIGURATION/net$VERSION/SslStress.dll $SSLSTRESS_ARGS \ No newline at end of file diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh index 80237579a1467a..99e8647c90c6d2 100755 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh @@ -35,13 +35,26 @@ if [[ ! -d $testhost_root ]]; then exit 1 fi +if [[ ! -d $daily_dotnet_root ]]; then + echo "Downloading daily SDK to $daily_dotnet_root" + mkdir $daily_dotnet_root + wget https://dot.net/v1/dotnet-install.sh -O $daily_dotnet_root/dotnet-install.sh + bash $daily_dotnet_root/dotnet-install.sh --no-path --channel $version.1xx --quality daily --install-dir $daily_dotnet_root +else + echo "Daily SDK found in $daily_dotnet_root" +fi + +export DOTNET_ROOT=$daily_dotnet_root +export PATH=$DOTNET_ROOT:$PATH +export DOTNET_MULTILEVEL_LOOKUP=0 + echo "Building solution." dotnet build -c $stress_configuration runscript=./run-stress-${stress_configuration,,}-${libraries_configuration,,}.sh if [[ ! -f $runscript ]]; then echo "Generating runscript." - echo "$testhost_root/dotnet exec ./bin/$stress_configuration/net$version/SslStress.dll \$@" > $runscript + echo "$testhost_root/dotnet exec --roll-forward Major ./bin/$stress_configuration/net$version/SslStress.dll \$@" > $runscript chmod +x $runscript fi diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/windows.Dockerfile b/src/libraries/System.Net.Security/tests/StressTests/SslStress/windows.Dockerfile index 542a5d7a20a215..75bdebb1e8b1e4 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/windows.Dockerfile +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/windows.Dockerfile @@ -23,5 +23,5 @@ ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV SSLSTRESS_ARGS="" -CMD & C:/live-runtime-artifacts/testhost/net$env:VERSION-windows-$env:CONFIGURATION-x64/dotnet.exe exec ` +CMD & C:/live-runtime-artifacts/testhost/net$env:VERSION-windows-$env:CONFIGURATION-x64/dotnet.exe exec --roll-forward Major ` ./bin/$env:CONFIGURATION/net$env:VERSION/SslStress.dll $env:SSLSTRESS_ARGS.Split() \ No newline at end of file