From 3a6e9d35739bbad514607ba8f6a30661369039ba Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 2 Feb 2023 15:29:55 -0800 Subject: [PATCH 01/12] stress test docker basefile updates --- .../chaos/examples/network-stress-example/Dockerfile | 2 +- .../chaos/examples/network-stress-scenarios-example/Dockerfile | 2 +- tools/stress-cluster/services/Stress.Watcher/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/stress-cluster/chaos/examples/network-stress-example/Dockerfile b/tools/stress-cluster/chaos/examples/network-stress-example/Dockerfile index 455e01e0161..d6a56a0d80a 100644 --- a/tools/stress-cluster/chaos/examples/network-stress-example/Dockerfile +++ b/tools/stress-cluster/chaos/examples/network-stress-example/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 # Included packages: https://github.com/microsoft/CBL-Mariner/blob/1.0/SPECS/core-packages/core-packages.spec ADD ./poll.sh /poll.sh diff --git a/tools/stress-cluster/chaos/examples/network-stress-scenarios-example/Dockerfile b/tools/stress-cluster/chaos/examples/network-stress-scenarios-example/Dockerfile index 455e01e0161..d6a56a0d80a 100644 --- a/tools/stress-cluster/chaos/examples/network-stress-scenarios-example/Dockerfile +++ b/tools/stress-cluster/chaos/examples/network-stress-scenarios-example/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 # Included packages: https://github.com/microsoft/CBL-Mariner/blob/1.0/SPECS/core-packages/core-packages.spec ADD ./poll.sh /poll.sh diff --git a/tools/stress-cluster/services/Stress.Watcher/Dockerfile b/tools/stress-cluster/services/Stress.Watcher/Dockerfile index 7e79b52792e..3496336a86c 100644 --- a/tools/stress-cluster/services/Stress.Watcher/Dockerfile +++ b/tools/stress-cluster/services/Stress.Watcher/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY ./src /src From 504e983ca2d6ae22783a9666928df69ca99c1b13 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 3 Feb 2023 09:25:49 -0800 Subject: [PATCH 02/12] dockerfile update --- tools/stress-cluster/services/Stress.Watcher/Dockerfile | 4 ++-- .../services/Stress.Watcher/src/Stress.Watcher.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/Dockerfile b/tools/stress-cluster/services/Stress.Watcher/Dockerfile index 3496336a86c..2187fd0d390 100644 --- a/tools/stress-cluster/services/Stress.Watcher/Dockerfile +++ b/tools/stress-cluster/services/Stress.Watcher/Dockerfile @@ -2,9 +2,9 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY ./src /src -RUN cd /src && dotnet publish -c Release -o /stresswatcher -f net6.0 +RUN cd /src && dotnet publish -c Release -o /stresswatcher -f net7.0 -FROM mcr.microsoft.com/dotnet/runtime:6.0 +FROM mcr.microsoft.com/dotnet/runtime:7.0 COPY --from=build /stresswatcher /stresswatcher diff --git a/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj b/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj index 1226dd0098f..96da9df44f8 100644 --- a/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj +++ b/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Stress.Watcher From 7d6692ac3ae2f55db2ec902e883a269a09a733cf Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 3 Feb 2023 09:55:31 -0800 Subject: [PATCH 03/12] updating stress watcher ci to net7.0 --- tools/stress-cluster/services/Stress.Watcher/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/ci.yml b/tools/stress-cluster/services/Stress.Watcher/ci.yml index dc4f7bb193c..cc099bcb3e2 100644 --- a/tools/stress-cluster/services/Stress.Watcher/ci.yml +++ b/tools/stress-cluster/services/Stress.Watcher/ci.yml @@ -25,5 +25,5 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml parameters: ToolDirectory: tools/stress-cluster/services/Stress.Watcher - DotNetCoreVersion: "6.0.x" + DotNetCoreVersion: "7.0.x" NoWarn: true From 77667875832fb7c3b021181cb481ae7c499ca48d Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 7 Feb 2023 11:55:42 -0800 Subject: [PATCH 04/12] stress watcher test net version bump --- .../services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj b/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj index 0bfd7c0a864..1df93934d56 100644 --- a/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj +++ b/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false From b1aea18f7a4db40be32714aa60bc314f2f998440 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 7 Feb 2023 13:22:02 -0800 Subject: [PATCH 05/12] get env var --- eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml index ccf4e3a85dd..818067e72d7 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml @@ -63,6 +63,8 @@ stages: displayName: Build and Package steps: + - script: set + displayName: show all env vars - task: UseDotNet@2 condition: eq(${{ parameters.SkipDotNetInstall }}, false) displayName: 'Use .NET Core sdk ${{ coalesce( parameters.DotNetCoreVersion, variables.DotNetCoreVersion) }}' From 086267a7fdac2dec1727d1da16f0a78f1ab04c9b Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 7 Feb 2023 13:29:34 -0800 Subject: [PATCH 06/12] show env vars --- eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml index 2b0ec52dc91..4ae574c04bb 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml @@ -64,6 +64,8 @@ stages: displayName: Build and Package steps: + - script: set + displayName: show all env vars - template: /eng/pipelines/templates/steps/install-dotnet.yml parameters: DotNetCoreVersion: ${{ parameters.DotNetCoreVersion }} From 9f3c85012c6e1658ef5075c9da7d9bdf3f68b0e2 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 7 Feb 2023 13:37:59 -0800 Subject: [PATCH 07/12] show env var after install dotnet7 --- eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml index 4ae574c04bb..4288bc29d52 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml @@ -64,12 +64,11 @@ stages: displayName: Build and Package steps: - - script: set - displayName: show all env vars - template: /eng/pipelines/templates/steps/install-dotnet.yml parameters: DotNetCoreVersion: ${{ parameters.DotNetCoreVersion }} - + - script: set + displayName: show all env vars - script: 'dotnet pack /p:ArtifactsPackagesDir=$(packagesToPublishDir) $(Warn) -c Release' displayName: 'Build and Package' workingDirectory: '${{ coalesce(parameters.PackageDirectory, parameters.ToolDirectory) }}' From 6e0775845836805081777314c61b5c331c2b4f2d Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 7 Feb 2023 14:29:07 -0800 Subject: [PATCH 08/12] testing if global affects --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index dc1a25ae9c1..1bfb43897e4 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "Microsoft.Build.Traversal": "3.2.0" }, "sdk": { - "version": "6.0.403", + "version": "7.0.102", "rollForward": "feature" } } \ No newline at end of file From a6b3b4bc358fbf5706faee26633b582bcab22d10 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 9 Feb 2023 14:10:54 -0800 Subject: [PATCH 09/12] delete unnecessary net version --- tools/stress-cluster/services/Stress.Watcher/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/ci.yml b/tools/stress-cluster/services/Stress.Watcher/ci.yml index cc099bcb3e2..4c9e7466489 100644 --- a/tools/stress-cluster/services/Stress.Watcher/ci.yml +++ b/tools/stress-cluster/services/Stress.Watcher/ci.yml @@ -25,5 +25,4 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml parameters: ToolDirectory: tools/stress-cluster/services/Stress.Watcher - DotNetCoreVersion: "7.0.x" NoWarn: true From 4e87ec4ba1b99571340b88206bf1834b30579406 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 9 Feb 2023 14:12:25 -0800 Subject: [PATCH 10/12] delete function call for debug --- eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml index 4288bc29d52..38ce01ce1c8 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml @@ -67,8 +67,7 @@ stages: - template: /eng/pipelines/templates/steps/install-dotnet.yml parameters: DotNetCoreVersion: ${{ parameters.DotNetCoreVersion }} - - script: set - displayName: show all env vars + - script: 'dotnet pack /p:ArtifactsPackagesDir=$(packagesToPublishDir) $(Warn) -c Release' displayName: 'Build and Package' workingDirectory: '${{ coalesce(parameters.PackageDirectory, parameters.ToolDirectory) }}' From 1d553aee337793371f29d9ceafbfea5d103977ed Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 9 Feb 2023 14:43:58 -0800 Subject: [PATCH 11/12] revert to net6 --- tools/stress-cluster/services/Stress.Watcher/Dockerfile | 4 ++-- .../services/Stress.Watcher/src/Stress.Watcher.csproj | 2 +- .../services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/Dockerfile b/tools/stress-cluster/services/Stress.Watcher/Dockerfile index 2187fd0d390..1fbabddad9e 100644 --- a/tools/stress-cluster/services/Stress.Watcher/Dockerfile +++ b/tools/stress-cluster/services/Stress.Watcher/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build COPY ./src /src RUN cd /src && dotnet publish -c Release -o /stresswatcher -f net7.0 -FROM mcr.microsoft.com/dotnet/runtime:7.0 +FROM mcr.microsoft.com/dotnet/runtime:6.0 COPY --from=build /stresswatcher /stresswatcher diff --git a/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj b/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj index 96da9df44f8..1226dd0098f 100644 --- a/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj +++ b/tools/stress-cluster/services/Stress.Watcher/src/Stress.Watcher.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net6.0 Stress.Watcher diff --git a/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj b/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj index 1df93934d56..0bfd7c0a864 100644 --- a/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj +++ b/tools/stress-cluster/services/Stress.Watcher/tests/Stress.Watcher.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false From 49ff31aa5fd88890585617c9f0f4255aeea78d30 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 9 Feb 2023 14:44:33 -0800 Subject: [PATCH 12/12] revert to net6 --- tools/stress-cluster/services/Stress.Watcher/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/stress-cluster/services/Stress.Watcher/Dockerfile b/tools/stress-cluster/services/Stress.Watcher/Dockerfile index 1fbabddad9e..7e79b52792e 100644 --- a/tools/stress-cluster/services/Stress.Watcher/Dockerfile +++ b/tools/stress-cluster/services/Stress.Watcher/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build COPY ./src /src -RUN cd /src && dotnet publish -c Release -o /stresswatcher -f net7.0 +RUN cd /src && dotnet publish -c Release -o /stresswatcher -f net6.0 FROM mcr.microsoft.com/dotnet/runtime:6.0