From 485eea361e6d915da3105239151c53e3fabd99c3 Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 26 Jul 2022 12:10:21 -0700 Subject: [PATCH 1/4] adding composite json scenario. --- .../Middleware-composite.dockerfile | 11 +++++++++++ scenarios/containers.benchmarks.yml | 14 ++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 docker/container-matrix/Middleware-composite.dockerfile diff --git a/docker/container-matrix/Middleware-composite.dockerfile b/docker/container-matrix/Middleware-composite.dockerfile new file mode 100644 index 000000000..f53110b38 --- /dev/null +++ b/docker/container-matrix/Middleware-composite.dockerfile @@ -0,0 +1,11 @@ +FROM mcr.microsoft.com/dotnet/nightly/sdk:latest AS build +WORKDIR /app +COPY . . +RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net7.0 /p:BenchmarksTargetFramework=net7.0 /p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION + +FROM composite.azurecr.io/aspnet-composite:7.0 AS runtime +# ENV ASPNETCORE_URLS http://*:5000 +WORKDIR /app +COPY --from=build /app/out ./ + +ENTRYPOINT ["dotnet", "Benchmarks.dll"] \ No newline at end of file diff --git a/scenarios/containers.benchmarks.yml b/scenarios/containers.benchmarks.yml index 0cf36045e..0fc1991ab 100644 --- a/scenarios/containers.benchmarks.yml +++ b/scenarios/containers.benchmarks.yml @@ -50,6 +50,20 @@ scenarios: path: /fortunes/raw serverPort: 8080 + json_aspnet_composite: + application: + job: aspnet + source: + dockerFile: docker/container-matrix/Middleware-composite.dockerfile + variables: + scenario: json + load: + job: wrk + variables: + presetHeaders: json + path: /json + serverPort: 8080 + json_aspnet_net6: application: job: aspnet From 6f7ca1d08ea56cdca50f7d303fabe041e2e652de Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 26 Jul 2022 12:18:07 -0700 Subject: [PATCH 2/4] fixing yaml indent --- scenarios/containers.benchmarks.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scenarios/containers.benchmarks.yml b/scenarios/containers.benchmarks.yml index 0fc1991ab..abff62bb8 100644 --- a/scenarios/containers.benchmarks.yml +++ b/scenarios/containers.benchmarks.yml @@ -50,19 +50,19 @@ scenarios: path: /fortunes/raw serverPort: 8080 - json_aspnet_composite: - application: - job: aspnet - source: - dockerFile: docker/container-matrix/Middleware-composite.dockerfile - variables: - scenario: json - load: - job: wrk - variables: - presetHeaders: json - path: /json - serverPort: 8080 + json_aspnet_composite: + application: + job: aspnet + source: + dockerFile: docker/container-matrix/Middleware-composite.dockerfile + variables: + scenario: json + load: + job: wrk + variables: + presetHeaders: json + path: /json + serverPort: 8080 json_aspnet_net6: application: From ce0623aff5e6cbe58b754995a38f048b0db2e3d5 Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 26 Jul 2022 12:20:17 -0700 Subject: [PATCH 3/4] another indent fix. --- scenarios/containers.benchmarks.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scenarios/containers.benchmarks.yml b/scenarios/containers.benchmarks.yml index abff62bb8..a1fb11d88 100644 --- a/scenarios/containers.benchmarks.yml +++ b/scenarios/containers.benchmarks.yml @@ -51,18 +51,18 @@ scenarios: serverPort: 8080 json_aspnet_composite: - application: - job: aspnet - source: - dockerFile: docker/container-matrix/Middleware-composite.dockerfile - variables: - scenario: json - load: - job: wrk - variables: - presetHeaders: json - path: /json - serverPort: 8080 + application: + job: aspnet + source: + dockerFile: docker/container-matrix/Middleware-composite.dockerfile + variables: + scenario: json + load: + job: wrk + variables: + presetHeaders: json + path: /json + serverPort: 8080 json_aspnet_net6: application: From 75bb2906ea8fe3d6f7ea59a5f2f065d8f9807293 Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:52:02 -0700 Subject: [PATCH 4/4] add mvcjson scenario --- scenarios/containers.benchmarks.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/scenarios/containers.benchmarks.yml b/scenarios/containers.benchmarks.yml index a1fb11d88..50fdd5e45 100644 --- a/scenarios/containers.benchmarks.yml +++ b/scenarios/containers.benchmarks.yml @@ -50,6 +50,18 @@ scenarios: path: /fortunes/raw serverPort: 8080 + mvcjson_aspnet: + application: + job: aspnet + variables: + scenario: mvcjson + load: + job: wrk + variables: + presetHeaders: json + path: /mvc/json + serverPort: 8080 + json_aspnet_composite: application: job: aspnet @@ -64,6 +76,20 @@ scenarios: path: /json serverPort: 8080 + mvcjson_aspnet_composite: + application: + job: aspnet + source: + dockerFile: docker/container-matrix/Middleware-composite.dockerfile + variables: + scenario: mvcjson + load: + job: wrk + variables: + presetHeaders: json + path: /mvc/json + serverPort: 8080 + json_aspnet_net6: application: job: aspnet