[iOS][maccatalyst] Reenable MacCatalyst and Simulator CI runs (#84930)

This reverts commit 67b6e81. Co-authored-by: Steve Pfister <[email protected]> Co-authored-by: Meri Khamoyan <[email protected]>
dotnet · Jun 14, 2023 · 4475c57 · 4475c57
1 parent f385924
commit 4475c57
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 56 deletions.
diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml
@@ -65,14 +65,11 @@ extends:
           isRollingBuild: ${{ variables.isRollingBuild }}
 
       # Add iOS/tvOS simulator jobs
-      #
-      # Disabled pending queue backup investigation 
-      #
-      #- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
-      #  parameters:
-      #    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-      #    isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
-      #    isRollingBuild: ${{ variables.isRollingBuild }}
+      - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+        parameters:
+          isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+          isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
+          isRollingBuild: ${{ variables.isRollingBuild }}
 
       # Add Android jobs
       - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
@@ -89,14 +86,11 @@ extends:
           isRollingBuild: ${{ variables.isRollingBuild }}
 
       # Add Mac Catalyst jobs
-      #
-      # Disabled pending queue backup investigation 
-      #
-      #- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
-      #  parameters:
-      #    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-      #    isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
-      #    isRollingBuild: ${{ variables.isRollingBuild }}
+      - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+        parameters:
+          isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+          isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
+          isRollingBuild: ${{ variables.isRollingBuild }}
 
       # Add Linux Bionic jobs
       - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -582,46 +582,43 @@ extends:
       # MacCatalyst interp - requires AOT Compilation and Interp flags
       # Build the whole product using Mono and run libraries tests
       #
-      #
-      # Disabled pending queue backup investigation
-      #
-      #- template: /eng/pipelines/common/platform-matrix.yml
-      #  parameters:
-      #    jobTemplate: /eng/pipelines/common/global-build-job.yml
-      #    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
-      #    buildConfig: Release
-      #    runtimeFlavor: mono
-      #    platforms:
-      #    - maccatalyst_x64
-      #    - ${{ if eq(variables['isRollingBuild'], true) }}:
-      #      - maccatalyst_arm64
-      #    variables:
-      #      # map dependencies variables to local variables
-      #      - name: librariesContainsChange
-      #        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      #      - name: monoContainsChange
-      #        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-      #    jobParameters:
-      #      testGroup: innerloop
-      #      nameSuffix: AllSubsets_Mono
-      #      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildDarwinFrameworks=true
-      #      timeoutInMinutes: 180
-      #      condition: >-
-      #        or(
-      #          eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-      #          eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
-      #          eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-      #          eq(variables['isRollingBuild'], true))
-      #      # extra steps, run tests
-      #      extraStepsTemplate: /eng/pipelines/libraries/helix.yml
-      #      extraStepsParameters:
-      #        creator: dotnet-bot
-      #        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-      #        condition: >-
-      #          or(
-      #            eq(variables['librariesContainsChange'], true),
-      #            eq(variables['monoContainsChange'], true),
-      #            eq(variables['isRollingBuild'], true))
+      - template: /eng/pipelines/common/platform-matrix.yml
+        parameters:
+          jobTemplate: /eng/pipelines/common/global-build-job.yml
+          helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+          buildConfig: Release
+          runtimeFlavor: mono
+          platforms:
+          - maccatalyst_x64
+          - ${{ if eq(variables['isRollingBuild'], true) }}:
+            - maccatalyst_arm64
+          variables:
+            # map dependencies variables to local variables
+            - name: librariesContainsChange
+              value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+            - name: monoContainsChange
+              value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
+          jobParameters:
+            testGroup: innerloop
+            nameSuffix: AllSubsets_Mono
+            buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildDarwinFrameworks=true
+            timeoutInMinutes: 180
+            condition: >-
+              or(
+                eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+                eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
+                eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+                eq(variables['isRollingBuild'], true))
+            # extra steps, run tests
+            extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+            extraStepsParameters:
+              creator: dotnet-bot
+              testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+              condition: >-
+                or(
+                  eq(variables['librariesContainsChange'], true),
+                  eq(variables['monoContainsChange'], true),
+                  eq(variables['isRollingBuild'], true))
 
       #
       # Build Mono and Installer on LLVMJIT mode

diff --git a/...es/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/ContainsUnknownFilesTests.cs b/...es/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/ContainsUnknownFilesTests.cs
@@ -12,6 +12,7 @@ private static MethodInfo s_containsUnknownFilesMethod
             = typeof(IsolatedStorageFile).GetMethod("ContainsUnknownFiles", BindingFlags.NonPublic | BindingFlags.Instance);
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void ContainsUnknownFiles_CleanStore(PresetScopes scope)
         {
             TestHelper.WipeStores();
@@ -23,6 +24,7 @@ public void ContainsUnknownFiles_CleanStore(PresetScopes scope)
         }
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void ContainsUnknownFiles_OkFiles(PresetScopes scope)
         {
             TestHelper.WipeStores();
@@ -42,6 +44,7 @@ public void ContainsUnknownFiles_OkFiles(PresetScopes scope)
         }
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void ContainsUnknownFiles_NotOkFiles(PresetScopes scope)
         {
             TestHelper.WipeStores();

diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/CopyFileTests.cs b/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/CopyFileTests.cs
@@ -98,6 +98,7 @@ public void CopyFile_CopyOver(PresetScopes scope)
         }
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void CopyFile_CopiesFile(PresetScopes scope)
         {
             TestHelper.WipeStores();

diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/MoveFileTests.cs b/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/MoveFileTests.cs
@@ -92,6 +92,7 @@ public void MoveFile_MoveOver(PresetScopes scope)
         }
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void MoveFile_MovesFile(PresetScopes scope)
         {
             TestHelper.WipeStores();

diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/OpenFileTests.cs b/src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/OpenFileTests.cs
@@ -127,6 +127,7 @@ public void OpenFile_PassesFileMode()
         }
 
         [Theory, MemberData(nameof(ValidStores))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/87485", TestPlatforms.MacCatalyst)]
         public void OpenFile_Existence(PresetScopes scope)
         {
             TestHelper.WipeStores();

diff --git a/src/libraries/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateServer.cs b/src/libraries/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.CreateServer.cs
@@ -257,6 +257,8 @@ public static void Windows_ServerCloneWithDifferentDirection_Throws_Unauthorized
         }
 
         [Fact]
+        [SkipOnPlatform(TestPlatforms.LinuxBionic, "SElinux blocks UNIX sockets in our CI environment")]
+        [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "iOS/tvOS blocks binding to UNIX sockets")]
         public static void PipeOptions_FirstPipeInstanceWithSameNameReuse_Throws_UnauthorizedAccessException()
         {
             string uniqueServerName = PipeStreamConformanceTests.GetUniquePipeName();