diff options
| author | Marie Píchová <11718369+ManickaP@users.noreply.github.com> | 2021-07-09 10:41:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 10:41:39 +0300 |
| commit | d431d6a15726797965336176efe9ae15aba241fd (patch) | |
| tree | 6856a6969c55fd5f7094c0002c347c3aa1b1a69f /eng | |
| parent | ede3733b1cf5902899e56caf748492ed993c98c8 (diff) | |
H/3 stress (#55098)
* Fixed event source name
* Updated docker files, updated stress test to H/3
* SSL stress updated as well
* Fixed docker and compilation warnings
* H/3 fixes
* Fixed nano-server version and nuget reference
* Debian stable version revert: bullseye --> buster
* Use msquic package in Linux stress container
* Bullseye is back, needs 6.0 SDK current preview
* Fixed pulling images in docker compose
* Disabled problematic error in H/2
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile | 2 | ||||
| -rw-r--r-- | eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile | 2 | ||||
| -rw-r--r-- | eng/docker/libraries-sdk.linux.Dockerfile | 2 | ||||
| -rw-r--r-- | eng/docker/libraries-sdk.windows.Dockerfile | 2 | ||||
| -rw-r--r-- | eng/pipelines/libraries/stress/http.yml | 10 |
5 files changed, 13 insertions, 5 deletions
diff --git a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile index 08adb4359e0..2a232ee4524 100644 --- a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile @@ -1,6 +1,6 @@ # Builds and copies library artifacts into target dotnet sdk image ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754 -ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-buster-slim +ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-bullseye-slim FROM $BUILD_BASE_IMAGE as corefxbuild diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index dd306fc4ff1..9fcb11a9a0c 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -1,6 +1,6 @@ # escape=` # Simple Dockerfile which copies library build artifacts into target dotnet sdk image -ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-nanoserver-1809 +ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 1d704ecbc42..fd4f071da19 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -1,6 +1,6 @@ # Builds and copies library artifacts into target dotnet sdk image ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754 -ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-buster-slim +ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-bullseye-slim FROM $BUILD_BASE_IMAGE as corefxbuild diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index 564378f4467..c8d993b18d3 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -1,6 +1,6 @@ # escape=` # Simple Dockerfile which copies clr and library build artifacts into target dotnet sdk image -ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-nanoserver-1809 +ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 08b7611d211..ba3a9f875f9 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -25,7 +25,7 @@ variables: jobs: - job: linux displayName: Docker Linux - timeoutInMinutes: 150 + timeoutInMinutes: 180 pool: name: NetCorePublic-Pool queue: BuildPool.Ubuntu.1804.Amd64.Open @@ -49,6 +49,14 @@ jobs: - bash: | cd '$(httpStressProject)' + export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0" + export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0" + docker-compose up --abort-on-container-exit --no-color + displayName: Run HttpStress - HTTP 3.0 + condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) + + - bash: | + cd '$(httpStressProject)' export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0" docker-compose up --abort-on-container-exit --no-color |