Skip to content

Commit 159f40e

Browse files
matouskozakmatouskozak
authored
[infra][apple-mobile] Migrate MacCatalyst and iOS/tvOS simulator jobs to osx.14.arm64.open and osx.15.amd64.open queues (#113313)
iOSSimulator, tvOSSimulator, MacCatalyst pipelines are migrated to: - `osx.15.amd64.open` - `osx.14.arm64.open` (until `osx.15.arm64.open` has enough machines) ## Newly failing test scenarios Some new failures were discovered during the migration. The tests were disabled and tracking issues were open to monitor progress for enablement. - System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds - System.IO.IsolatedStorage - System.IO. MemoryMappedFiles - System.Net.Sockets.Tests.SendTo_.*.Datagram_UDP_AccessDenied_Throws_DoesNotBind
1 parent 81efbf1 commit 159f40e

File tree

9 files changed

+70
-50
lines changed

9 files changed

+70
-50
lines changed

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434

3535
# iOS Simulator/Mac Catalyst arm64
3636
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
37-
- OSX.1200.Arm64.Open
37+
- OSX.14.Arm64.Open
3838

3939
# iOS/tvOS Simulator x64 & MacCatalyst x64
4040
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
41-
- OSX.1200.Amd64.Open
41+
- OSX.15.Amd64.Open
4242

4343
# Android arm64
4444
- ${{ if in(parameters.platform, 'android_arm64') }}:

‎eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ jobs:
2525
platforms:
2626
- iossimulator_x64
2727
- tvossimulator_x64
28-
# don't run tests on arm64 PRs until we can get significantly more devices
29-
- ${{ if eq(variables['isRollingBuild'], true) }}:
30-
- iossimulator_arm64
28+
- iossimulator_arm64
3129
variables:
3230
# map dependencies variables to local variables
3331
- name: librariesContainsChange
@@ -61,9 +59,7 @@ jobs:
6159
platforms:
6260
- iossimulator_x64
6361
- tvossimulator_x64
64-
# don't run tests on arm64 PRs until we can get significantly more devices
65-
- ${{ if eq(variables['isRollingBuild'], true) }}:
66-
- iossimulator_arm64
62+
- iossimulator_arm64
6763
variables:
6864
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
6965
- name: _HelixSource
@@ -108,9 +104,7 @@ jobs:
108104
platforms:
109105
- iossimulator_x64
110106
- tvossimulator_x64
111-
# don't run tests on arm64 PRs until we can get significantly more devices
112-
- ${{ if eq(variables['isRollingBuild'], true) }}:
113-
- iossimulator_arm64
107+
- iossimulator_arm64
114108
variables:
115109
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
116110
- name: _HelixSource

‎eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ jobs:
9898

9999
# iOS Simulator/Mac Catalyst arm64
100100
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
101-
- OSX.1200.Arm64.Open
101+
- OSX.14.Arm64.Open
102102

103103
# iOS/tvOS Simulator x64 & MacCatalyst x64
104104
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
105-
- OSX.1200.Amd64.Open
105+
- OSX.15.Amd64.Open
106106

107107
# iOS devices
108108
- ${{ if in(parameters.platform, 'ios_arm64') }}:

‎eng/pipelines/runtime.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,8 +1086,7 @@ extends:
10861086
runtimeFlavor: mono
10871087
platforms:
10881088
- maccatalyst_x64
1089-
- ${{ if eq(variables['isRollingBuild'], true) }}:
1090-
- maccatalyst_arm64
1089+
- maccatalyst_arm64
10911090
variables:
10921091
# map dependencies variables to local variables
10931092
- name: librariesContainsChange

‎src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/RemoveTests.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace System.IO.IsolatedStorage
88
public class RemoveTests : IsoStorageTest
99
{
1010
[Fact]
11+
[ActiveIssue("https://github.com/dotnet/runtime/issues/114403", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst))]
1112
public void RemoveUserStoreForApplication()
1213
{
1314
TestHelper.WipeStores();
@@ -23,6 +24,7 @@ public void RemoveUserStoreForApplication()
2324
}
2425

2526
[Fact]
27+
[ActiveIssue("https://github.com/dotnet/runtime/issues/114403", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst))]
2628
public void RemoveUserStoreForAssembly()
2729
{
2830
TestHelper.WipeStores();
@@ -38,6 +40,7 @@ public void RemoveUserStoreForAssembly()
3840
}
3941

4042
[Fact]
43+
[ActiveIssue("https://github.com/dotnet/runtime/issues/114403", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst))]
4144
public void RemoveUserStoreForDomain()
4245
{
4346
TestHelper.WipeStores();
@@ -54,7 +57,9 @@ public void RemoveUserStoreForDomain()
5457
}
5558
}
5659

57-
[Theory, MemberData(nameof(ValidStores))]
60+
[Theory]
61+
[MemberData(nameof(ValidStores))]
62+
[ActiveIssue("https://github.com/dotnet/runtime/issues/114403", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst))]
5863
public void RemoveStoreWithContent(PresetScopes scope)
5964
{
6065
TestHelper.WipeStores();

‎src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.Win32.SafeHandles;
5+
using System.Collections.Generic;
56
using System.Runtime.CompilerServices;
67
using Microsoft.DotNet.XUnitExtensions;
78
using Xunit;
@@ -56,24 +57,33 @@ public void InvalidArguments()
5657
}
5758
}
5859

60+
public static IEnumerable<object[]> AccessLevelCombinationsData()
61+
{
62+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Read };
63+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Write };
64+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWrite };
65+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.CopyOnWrite };
66+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadExecute };
67+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWriteExecute };
68+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.Read };
69+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
70+
// https://github.com/dotnet/runtime/issues/114403
71+
if (PlatformDetection.IsNotMacCatalyst)
72+
{
73+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.ReadExecute };
74+
}
75+
yield return new object[] { MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.Read };
76+
yield return new object[] { MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.CopyOnWrite };
77+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Read };
78+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Write };
79+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.ReadWrite };
80+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.CopyOnWrite };
81+
yield return new object[] { MemoryMappedFileAccess.Read, MemoryMappedFileAccess.Read };
82+
yield return new object[] { MemoryMappedFileAccess.Read, MemoryMappedFileAccess.CopyOnWrite };
83+
}
84+
5985
[ConditionalTheory]
60-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Read)]
61-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Write)]
62-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWrite)]
63-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.CopyOnWrite)]
64-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadExecute)]
65-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWriteExecute)]
66-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.Read)]
67-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite)]
68-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.ReadExecute)]
69-
[InlineData(MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.Read)]
70-
[InlineData(MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.CopyOnWrite)]
71-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Read)]
72-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Write)]
73-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.ReadWrite)]
74-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.CopyOnWrite)]
75-
[InlineData(MemoryMappedFileAccess.Read, MemoryMappedFileAccess.Read)]
76-
[InlineData(MemoryMappedFileAccess.Read, MemoryMappedFileAccess.CopyOnWrite)]
86+
[MemberData(nameof(AccessLevelCombinationsData))]
7787
public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, MemoryMappedFileAccess viewAccess)
7888
{
7989
const int Capacity = 4096;

‎src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.Win32.SafeHandles;
5+
using System.Collections.Generic;
56
using System.Runtime.CompilerServices;
67
using Microsoft.DotNet.XUnitExtensions;
78
using Xunit;
@@ -56,24 +57,33 @@ public void InvalidArguments()
5657
}
5758
}
5859

60+
public static IEnumerable<object[]> AccessLevelCombinationsData()
61+
{
62+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Read };
63+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Write };
64+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWrite };
65+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.CopyOnWrite };
66+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadExecute };
67+
yield return new object[] { MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWriteExecute };
68+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.Read };
69+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite };
70+
// https://github.com/dotnet/runtime/issues/114403
71+
if (PlatformDetection.IsNotMacCatalyst)
72+
{
73+
yield return new object[] { MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.ReadExecute };
74+
}
75+
yield return new object[] { MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.Read };
76+
yield return new object[] { MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.CopyOnWrite };
77+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Read };
78+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Write };
79+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.ReadWrite };
80+
yield return new object[] { MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.CopyOnWrite };
81+
yield return new object[] { MemoryMappedFileAccess.Read, MemoryMappedFileAccess.Read };
82+
yield return new object[] { MemoryMappedFileAccess.Read, MemoryMappedFileAccess.CopyOnWrite };
83+
}
84+
5985
[ConditionalTheory]
60-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Read)]
61-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.Write)]
62-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWrite)]
63-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.CopyOnWrite)]
64-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadExecute)]
65-
[InlineData(MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileAccess.ReadWriteExecute)]
66-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.Read)]
67-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.CopyOnWrite)]
68-
[InlineData(MemoryMappedFileAccess.ReadExecute, MemoryMappedFileAccess.ReadExecute)]
69-
[InlineData(MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.Read)]
70-
[InlineData(MemoryMappedFileAccess.CopyOnWrite, MemoryMappedFileAccess.CopyOnWrite)]
71-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Read)]
72-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.Write)]
73-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.ReadWrite)]
74-
[InlineData(MemoryMappedFileAccess.ReadWrite, MemoryMappedFileAccess.CopyOnWrite)]
75-
[InlineData(MemoryMappedFileAccess.Read, MemoryMappedFileAccess.Read)]
76-
[InlineData(MemoryMappedFileAccess.Read, MemoryMappedFileAccess.CopyOnWrite)]
86+
[MemberData(nameof(AccessLevelCombinationsData))]
7787
public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, MemoryMappedFileAccess viewAccess)
7888
{
7989
const int Capacity = 4096;

‎src/libraries/System.Net.Sockets/tests/FunctionalTests/SendTo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public async Task Datagram_UDP_ShouldImplicitlyBindLocalEndpoint()
9595

9696
[Fact]
9797
[SkipOnPlatform(TestPlatforms.FreeBSD, "FreeBSD allows sendto() to broadcast")]
98+
[ActiveIssue("https://github.com/dotnet/runtime/issues/114450", typeof(PlatformDetection), nameof(PlatformDetection.IsMacCatalyst), nameof(PlatformDetection.IsX64Process))]
9899
public async Task Datagram_UDP_AccessDenied_Throws_DoesNotBind()
99100
{
100101
IPEndPoint invalidEndpoint = new IPEndPoint(IPAddress.Broadcast, 1234);

‎src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS
6868

6969
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
7070
[ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))]
71+
[ActiveIssue("https://github.com/dotnet/runtime/issues/113827", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
7172
public async Task MulticastInterface_Set_AnyInterface_Succeeds()
7273
{
7374
// On all platforms, index 0 means "any interface"

0 commit comments

Comments
 (0)