Skip to content

Commit 821d6cc

Browse files
authored
Fixes for outerloop-mono.yml (#88743)
Consolidate configurations and disable failing tests with ActiveIssue.
1 parent 2b477ae commit 821d6cc

File tree

19 files changed

+476
-377
lines changed

19 files changed

+476
-377
lines changed
Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trigger: none
22

33
schedules:
4-
- cron: "0 8 * * *" # 8 AM UTC => 12 AM PST
4+
- cron: "0 8 * * 2,4" # 8 AM UTC => 12 AM PST, every Tuesday and Thursday
55
displayName: Outerloop scheduled build
66
branches:
77
include:
@@ -24,14 +24,14 @@ extends:
2424
buildConfig: Release
2525
runtimeFlavor: mono
2626
platforms:
27-
- windows_x86
28-
- browser_wasm
29-
- ${{ if eq(variables['isRollingBuild'], true) }}:
3027
- windows_x64
3128
- linux_x64
32-
- linux_arm
33-
- linux_musl_x64
3429
- osx_x64
30+
- ${{ if eq(variables['isRollingBuild'], true) }}:
31+
- android_x64
32+
- linux_arm
33+
- linux_musl_x64
34+
- windows_x86
3535
jobParameters:
3636
testScope: outerloop
3737
nameSuffix: AllSubsets_Mono
@@ -41,34 +41,29 @@ extends:
4141
# extra steps, run tests
4242
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
4343
extraStepsParameters:
44-
scenarios:
45-
- WasmTestOnBrowser
4644
testScope: outerloop
4745
creator: dotnet-bot
4846
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
4947

50-
- ${{ if eq(variables['isRollingBuild'], false) }}:
51-
- template: /eng/pipelines/common/platform-matrix.yml
52-
parameters:
53-
jobTemplate: /eng/pipelines/common/global-build-job.yml
54-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
55-
buildConfig: Debug
56-
runtimeFlavor: mono
57-
platforms:
58-
- windows_x64
59-
- linux_x64
60-
- linux_musl_x64
61-
- osx_x64
62-
- android_arm64
63-
jobParameters:
48+
- template: /eng/pipelines/common/platform-matrix.yml
49+
parameters:
50+
jobTemplate: /eng/pipelines/common/global-build-job.yml
51+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
52+
buildConfig: Release
53+
runtimeFlavor: mono
54+
platforms:
55+
- browser_wasm
56+
jobParameters:
57+
testScope: outerloop
58+
nameSuffix: AllSubsets_Mono
59+
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) -testscope outerloop /p:ArchiveTests=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
60+
timeoutInMinutes: 180
61+
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
62+
# extra steps, run tests
63+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
64+
extraStepsParameters:
65+
scenarios:
66+
- normal
6467
testScope: outerloop
65-
nameSuffix: AllSubsets_Mono
66-
buildArgs: -s mono+host.native+libs+libs.tests -c $(_BuildConfig) -testscope outerloop /p:ArchiveTests=true
67-
timeoutInMinutes: 180
68-
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
69-
# extra steps, run tests
70-
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
71-
extraStepsParameters:
72-
testScope: outerloop
73-
creator: dotnet-bot
74-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
68+
creator: dotnet-bot
69+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)

eng/pipelines/libraries/outerloop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extends:
4040
- osx_x64
4141
jobParameters:
4242
testScope: outerloop
43-
nameSuffix: CoreCLR_Release
43+
nameSuffix: CoreCLR_$(_BuildConfig)
4444
buildArgs: -s clr+host.native+libs+libs.tests -lc $(_BuildConfig) -hc $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
4545
timeoutInMinutes: 180
4646
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
@@ -68,7 +68,7 @@ extends:
6868
- osx_x64
6969
jobParameters:
7070
testScope: outerloop
71-
nameSuffix: CoreCLR_Release
71+
nameSuffix: CoreCLR_$(_BuildConfig)
7272
buildArgs: -s clr+host.native+libs+libs.tests -lc $(_BuildConfig) -hc $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
7373
timeoutInMinutes: 180
7474
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
using Xunit;
6+
7+
[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/88992", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.IsX86Process))]

src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<Compile Include="..\src\System\Diagnostics\Metrics\StringSequence.cs" Link="StringSequence.cs" />
2424
<Compile Include="..\src\System\Diagnostics\Metrics\StringSequence.netcore.cs" Link="StringSequence.netcore.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
2525
<Compile Include="..\src\System\Diagnostics\Metrics\StringSequence.netfx.cs" Link="StringSequence.netfx.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
26+
<Compile Include="AssemblyInfo.cs" />
2627
<Compile Include="AggregationManagerTests.cs" />
2728
<Compile Include="ExponentialHistogramTests.cs" />
2829
<Compile Include="DiagnosticSourceTests.cs" />
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System;
45
using Xunit;
56

67
[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", ~RuntimeConfiguration.Release)]
78
[assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Net.Sockets is not supported on Browser")]
9+
[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/88992", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.IsX86Process))]

src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketAsyncEventArgsTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System;
45
using System.Buffers;
56
using System.Collections.Generic;
67
using System.Linq;
@@ -847,7 +848,7 @@ public void SetBufferMemory_NonArray_BufferReturnsNull()
847848
}
848849

849850
[OuterLoop("Involves GC and finalization")]
850-
[Theory]
851+
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsPreciseGcSupported))]
851852
[InlineData(false)]
852853
[InlineData(true)]
853854
public void Finalizer_InvokedWhenNoLongerReferenced(bool afterAsyncOperation)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
using Xunit;
6+
7+
[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/88992", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.IsX86Process))]

src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<EventSourceSupport>true</EventSourceSupport>
55
</PropertyGroup>
66
<ItemGroup>
7+
<Compile Include="AssemblyInfo.cs" />
78
<Compile Include="AdditionalCacheTests\AdditionalCacheTests.cs" />
89
<Compile Include="Common\PokerChangeMonitor.cs" />
910
<Compile Include="Common\PokerMemoryCache.cs" />
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
using Xunit;
6+
7+
[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/88992", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.IsX86Process))]

src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup>
7+
<Compile Include="AssemblyInfo.cs" />
78
<Compile Include="CheckArchitectureTests.cs" />
89
<Compile Include="CheckPlatformTests.cs" />
910
<Compile Include="RuntimeIdentifierTests.cs" />

0 commit comments

Comments
 (0)