Skip to content

[tests] Fixes to improve helix test runs hitting docker soft limits for network subnets #5694

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 5 commits into from
Sep 13, 2024
Merged

[tests] Fixes to improve helix test runs hitting docker soft limits for network subnets #5694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cb1e7d
[tests] Disable parallel test runs on helix
radical Sep 12, 2024
1fc1bbd
[tests] Prune docker networks on helix agents before/after the runs
radical Sep 12, 2024
113a483
[tests] Bump timeout for Aspire.Pomelo.EntityFrameworkCore.MySql.Test…
radical Sep 12, 2024
d50bb82
Address review feedback from @ joperezr
radical Sep 13, 2024
7e03353
fix typo
radical Sep 13, 2024
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: 2 additions & 0 deletions tests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<VSTestRunSettingsFile Condition="'$(VSTestRunSettingsFile)' == ''">$(RunSettingsFilePath)</VSTestRunSettingsFile>

<DeployRunSettingsFile Condition="'$(DeployRunSettingsFile)' == ''">true</DeployRunSettingsFile>
<!-- Use a separate xunit.runner.json for helix that disables parallel test runs -->
<XunitRunnerJson Condition="'$(XunitRunnerJson)' == '' and '$(ArchiveTests)' == 'true'">$(RepoRoot)tests\helix\xunit.runner.json</XunitRunnerJson>
<XunitRunnerJson Condition="'$(XunitRunnerJson)' == ''">$(RepositoryEngineeringDir)testing\xunit.runner.json</XunitRunnerJson>

<RunTestsOnHelix Condition="'$(RunTestsOnHelix)' == '' and ('$(IsTestProject)' == 'true' and '$(IsTestSupportProject)' != 'true')">true</RunTestsOnHelix>
Expand Down
3 changes: 2 additions & 1 deletion tests/helix/send-to-helix-basictests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@

<ItemGroup>
<_DefaultWorkItems Include="$(WorkItemArchiveWildCard)" />
<!-- runsettings timeout in ms, default to 10 mins -->
<!-- runsettings timeout in ms, default to 15 mins -->
<_DefaultWorkItems TimeoutMs="900000" />

<_DefaultWorkItems Condition="'%(FileName)' == 'Aspire.Hosting.Elasticsearch.Tests'" TimeoutMs="1200000" />
<_DefaultWorkItems Condition="'%(FileName)' == 'Aspire.Hosting.Oracle.Tests'" TimeoutMs="1200000" />
<_DefaultWorkItems Condition="'%(FileName)' == 'Aspire.Pomelo.EntityFrameworkCore.MySql.Tests'" TimeoutMs="1200000" />

<HelixWorkItem Include="@(_DefaultWorkItems -> '%(FileName)')">
<PayloadArchive>%(Identity)</PayloadArchive>
Expand Down
2 changes: 2 additions & 0 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 @@ -126,11 +126,13 @@
<HelixPreCommand Include="$(_ShutdownDockerContainersCommand)" />
<HelixPreCommand Include="docker volume ls" />
<HelixPreCommand Include="$(_DeleteDockerVolumesCommand)" />
<HelixPreCommand Include="docker network prune -f" />

<HelixPostCommand Include="docker container ls --all" />
<HelixPostCommand Include="$(_ShutdownDockerContainersCommand)" />
<HelixPostCommand Include="docker volume ls" />
<HelixPostCommand Include="$(_DeleteDockerVolumesCommand)" />
<HelixPostCommand Include="docker network prune -f" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions tests/helix/xunit.runner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
"longRunningTestSeconds": 120,
"parallelizeAssembly": false,
"parallelizeTestCollections": false
}
Loading