Skip to content

Commit c9f02da

Browse files
authored
Revert "Explicitly set Docker as test runtime to avoid issues with docker info (#9200)" (#9339)
This reverts commit 8692e43.
1 parent 3850afa commit c9f02da

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ jobs:
213213
working-directory: ${{ github.workspace }}/run-tests/
214214
env:
215215
CI: false
216-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
217216
DCP_DIAGNOSTICS_LOG_LEVEL: debug
218217
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
219218
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Debug/Shipping
@@ -236,7 +235,6 @@ jobs:
236235
id: run-tests
237236
env:
238237
CI: false
239-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
240238
DCP_DIAGNOSTICS_LOG_LEVEL: debug
241239
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
242240
# During restore and build, we use -ci, which causes NUGET_PACKAGES to point to a local cache (Arcade behavior).

eng/pipelines/templates/BuildAndTest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ steps:
106106
"${{ parameters.buildScript }} -testnobuild -test -configuration ${{ parameters.buildConfig }} /bl:${{ parameters.repoLogPath }}/tests.binlog /maxcpucount:1 /p:BuildInParallel=false $(_OfficialBuildIdArgs)"
107107
env:
108108
DOCKER_BUILDKIT: 1
109-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
110109
# https://github.com/dotnet/aspire/issues/5195#issuecomment-2271687822
111110
DOTNET_ASPIRE_DEPENDENCY_CHECK_TIMEOUT: 180
112111
DCP_DIAGNOSTICS_LOG_LEVEL: debug

tests/helix/send-to-helix-inner.proj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@
153153

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

156-
<!-- Force container runtime to Docker since that's what is installed on Helix -->
157-
<HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="$(_EnvVarSetKeyword) DOTNET_ASPIRE_CONTAINER_RUNTIME=docker" />
158-
159156
<!-- Set the DCP env -->
160157
<HelixPreCommand Include="$(_EnvVarSetKeyword) DCP_DIAGNOSTICS_LOG_LEVEL=debug" />
161158
<HelixPreCommand Include="$(_EnvVarSetKeyword) DCP_DIAGNOSTICS_LOG_FOLDER=$(_HelixLogsPath)" />

0 commit comments

Comments
 (0)