Remove runtime-ioslike-mono and runtime-ioslike-coreclr pipelines (#88999)

diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 9e2a737..2a757f8 100644 (file)
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -20,7 +20,7 @@ variables:
 - name: isWasmOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-wasm-dbgtests', 'runtime-wasm-optional') }}
 - name: isiOSLikeOnlyBuild
-  value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike', 'runtime-ioslike-mono', 'runtime-ioslike-coreclr') }}
+  value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike') }}
 - name: isiOSLikeSimulatorOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslikesimulator') }}
 - name: isAndroidOnlyBuild
@@ -32,14 +32,14 @@ variables:
 - name: isLinuxBionicOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-linuxbionic') }}
 - name: isRunSmokeTestsOnly
-  value: ${{ notin(variables['Build.DefinitionName'], 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslike-mono', 'runtime-ioslike-coreclr', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
+  value: ${{ notin(variables['Build.DefinitionName'], 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
 - name: isNotSpecificPlatformOnlyBuild
-  value: ${{ notin(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslike-mono', 'runtime-ioslike-coreclr', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
+  value: ${{ notin(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
 
 # We only run evaluate paths on runtime and runtime-community pipelines on PRs
 # keep in sync with /eng/pipelines/common/xplat-setup.yml
 - name: dependOnEvaluatePaths
-  value: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslike-mono', 'runtime-ioslike-coreclr', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic', 'dotnet-linker-tests', 'runtime-dev-innerloop', 'runtime-coreclr superpmi-replay', 'runtime-coreclr superpmi-diffs')) }}
+  value: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-community', 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic', 'dotnet-linker-tests', 'runtime-dev-innerloop', 'runtime-coreclr superpmi-replay', 'runtime-coreclr superpmi-diffs')) }}
 - name: debugOnPrReleaseOnRolling
   ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
     value: Release

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
index 6145d3e..bc30978 100644 (file)
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
@@ -7,120 +7,116 @@ parameters:
   isExtraPlatformsBuild: false
   isiOSLikeOnlyBuild: false
   isRollingBuild: false
-  isMonoOnlyBuild: false
-  isCoreclrOnlyBuild: false
 
 jobs:
 
-- ${{ if eq(parameters.isCoreclrOnlyBuild, false) }}:
-  #
-  # iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
-  # Build the whole product using Mono and run libraries tests
-  #
-  - 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
-      isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-      isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-      platforms:
-        - ios_arm64
-        - tvos_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
-        isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-        buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true
-        timeoutInMinutes: 180
-        # extra steps, run tests
-        extraStepsTemplate: /eng/pipelines/libraries/helix.yml
-        extraStepsParameters:
-          creator: dotnet-bot
-          testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-          extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
+#
+# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
+# Build the whole product using Mono and run libraries tests
+#
+- 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
+    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    platforms:
+      - ios_arm64
+      - tvos_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
+      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+      buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true
+      timeoutInMinutes: 180
+      # extra steps, run tests
+      extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+        extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
 
-  #
-  # Build the whole product using Mono for iOS/tvOS and run runtime tests with iOS/tvOS devices
-  #
-  - template: /eng/pipelines/common/platform-matrix.yml
-    parameters:
-      jobTemplate: /eng/pipelines/common/global-build-job.yml
-      helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-      buildConfig: Release
-      runtimeFlavor: mono
-      isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-      isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-      platforms:
-        - ios_arm64
-        - tvos_arm64
-      variables:
-        - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-          - name: _HelixSource
-            value: pr/dotnet/runtime/$(Build.SourceBranch)
-        - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-          - name: _HelixSource
-            value: ci/dotnet/runtime/$(Build.SourceBranch)
-        - name: timeoutPerTestInMinutes
-          value: 60
-        - name: timeoutPerTestCollectionInMinutes
-          value: 180
-      jobParameters:
-        testGroup: innerloop
-        nameSuffix: AllSubsets_Mono_RuntimeTests
-        buildArgs: -s mono+libs -c $(_BuildConfig)
-        timeoutInMinutes: 240
-        # extra steps, run tests
-        extraVariablesTemplates:
-          - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-            parameters:
-              testGroup: innerloop
-        extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-        extraStepsParameters:
-          creator: dotnet-bot
-          # FIXME: Currently, tracing/eventpipe tests are only enabled on iOS platforms. It should be expanded to include all runtime tests. Tracking issue: https://github.com/dotnet/runtime/issues/84254
-          testBuildArgs: tree tracing/eventpipe
-          testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+#
+# Build the whole product using Mono for iOS/tvOS and run runtime tests with iOS/tvOS devices
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+    buildConfig: Release
+    runtimeFlavor: mono
+    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    platforms:
+      - ios_arm64
+      - tvos_arm64
+    variables:
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+        - name: _HelixSource
+          value: pr/dotnet/runtime/$(Build.SourceBranch)
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+        - name: _HelixSource
+          value: ci/dotnet/runtime/$(Build.SourceBranch)
+      - name: timeoutPerTestInMinutes
+        value: 60
+      - name: timeoutPerTestCollectionInMinutes
+        value: 180
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: AllSubsets_Mono_RuntimeTests
+      buildArgs: -s mono+libs -c $(_BuildConfig)
+      timeoutInMinutes: 240
+      # extra steps, run tests
+      extraVariablesTemplates:
+        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
+          parameters:
+            testGroup: innerloop
+      extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        # FIXME: Currently, tracing/eventpipe tests are only enabled on iOS platforms. It should be expanded to include all runtime tests. Tracking issue: https://github.com/dotnet/runtime/issues/84254
+        testBuildArgs: tree tracing/eventpipe
+        testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
-- ${{ if eq(parameters.isMonoOnlyBuild, false) }}:
-  #
-  # Build the whole product using NativeAOT for iOS/tvOS and run runtime tests with iOS/tvOS devices
-  #
-  - template: /eng/pipelines/common/platform-matrix.yml
-    parameters:
-      jobTemplate: /eng/pipelines/common/global-build-job.yml
-      helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-      buildConfig: Release
-      runtimeFlavor: coreclr
-      isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-      isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-      platforms:
-        - ios_arm64
-        - tvos_arm64
-      variables:
-        - name: timeoutPerTestInMinutes
-          value: 60
-        - name: timeoutPerTestCollectionInMinutes
-          value: 180
-      jobParameters:
-        testGroup: innerloop
-        nameSuffix: AllSubsets_NativeAOT_RuntimeTests
-        timeoutInMinutes: 240
-        buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs -c $(_BuildConfig)
-        # extra steps, run tests
-        extraVariablesTemplates:
-          - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-            parameters:
-              testGroup: innerloop
-        extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-        extraStepsParameters:
-          creator: dotnet-bot
-          testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
-          testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
+#
+# Build the whole product using NativeAOT for iOS/tvOS and run runtime tests with iOS/tvOS devices
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+    buildConfig: Release
+    runtimeFlavor: coreclr
+    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
+    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    platforms:
+      - ios_arm64
+      - tvos_arm64
+    variables:
+      - name: timeoutPerTestInMinutes
+        value: 60
+      - name: timeoutPerTestCollectionInMinutes
+        value: 180
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: AllSubsets_NativeAOT_RuntimeTests
+      timeoutInMinutes: 240
+      buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs -c $(_BuildConfig)
+      # extra steps, run tests
+      extraVariablesTemplates:
+        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
+          parameters:
+            testGroup: innerloop
+      extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+      extraStepsParameters:
+        creator: dotnet-bot
+        testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
+        testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)

diff --git a/eng/pipelines/runtime-ioslike-coreclr.yml b/eng/pipelines/runtime-ioslike-coreclr.yml
deleted file mode 100644 (file)
index dd82731..0000000
--- a/eng/pipelines/runtime-ioslike-coreclr.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is a wrapper yml for `runtime-extra-platforms-ioslike.yml`, which runs Native AOT iOS/tvOS runtime tests.
-
-trigger: none
-
-variables:
-  - template: /eng/pipelines/common/variables.yml
-
-extends:
-  template:  /eng/pipelines/common/templates/pipeline-with-resources.yml
-  parameters:
-    stages:
-    - stage: Build
-      jobs:
-      - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
-        parameters:
-          isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-          isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
-          isRollingBuild: ${{ variables.isRollingBuild }}
-          isCoreclrOnlyBuild: true

diff --git a/eng/pipelines/runtime-ioslike-mono.yml b/eng/pipelines/runtime-ioslike-mono.yml
deleted file mode 100644 (file)
index 4e32db9..0000000
--- a/eng/pipelines/runtime-ioslike-mono.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is a wrapper yml for `runtime-extra-platforms-ioslike.yml`, which runs Mono AOT iOS/tvOS runtime tests.
-
-trigger: none
-
-variables:
-  - template: /eng/pipelines/common/variables.yml
-
-extends:
-  template:  /eng/pipelines/common/templates/pipeline-with-resources.yml
-  parameters:
-    stages:
-    - stage: Build
-      jobs:
-      - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
-        parameters:
-          isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-          isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
-          isRollingBuild: ${{ variables.isRollingBuild }}
-          isMonoOnlyBuild: true