Skip to content

Remove the workaround to explicitly set the container runtime for tests now that the orchestrator is updated #9339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

Remove the workaround to explicitly set the container runtime for tests now that the orchestrator is updated #9339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ jobs:
working-directory: ${{ github.workspace }}/run-tests/
env:
CI: false
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
DCP_DIAGNOSTICS_LOG_LEVEL: debug
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Debug/Shipping
Expand All @@ -236,7 +235,6 @@ jobs:
id: run-tests
env:
CI: false
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
DCP_DIAGNOSTICS_LOG_LEVEL: debug
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
# During restore and build, we use -ci, which causes NUGET_PACKAGES to point to a local cache (Arcade behavior).
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/templates/BuildAndTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ steps:
"${{ parameters.buildScript }} -testnobuild -test -configuration ${{ parameters.buildConfig }} /bl:${{ parameters.repoLogPath }}/tests.binlog /maxcpucount:1 /p:BuildInParallel=false $(_OfficialBuildIdArgs)"
env:
DOCKER_BUILDKIT: 1
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
# https://github.com/dotnet/aspire/issues/5195#issuecomment-2271687822
DOTNET_ASPIRE_DEPENDENCY_CHECK_TIMEOUT: 180
DCP_DIAGNOSTICS_LOG_LEVEL: debug
Expand Down
3 changes: 0 additions & 3 deletions tests/helix/send-to-helix-inner.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@

<HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="dotnet dev-certs https --trust" />

<!-- Force container runtime to Docker since that's what is installed on Helix -->
<HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="$(_EnvVarSetKeyword) DOTNET_ASPIRE_CONTAINER_RUNTIME=docker" />

<!-- Set the DCP env -->
<HelixPreCommand Include="$(_EnvVarSetKeyword) DCP_DIAGNOSTICS_LOG_LEVEL=debug" />
<HelixPreCommand Include="$(_EnvVarSetKeyword) DCP_DIAGNOSTICS_LOG_FOLDER=$(_HelixLogsPath)" />
Expand Down