Skip to content

Commit 1380a0b

Browse files
authored
Remove runtime-ioslike-mono and runtime-ioslike-coreclr pipelines (#88999)
1 parent c0971e5 commit 1380a0b

File tree

4 files changed

+112
-154
lines changed

4 files changed

+112
-154
lines changed

eng/pipelines/common/variables.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variables:
2020
- name: isWasmOnlyBuild
2121
value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-wasm-dbgtests', 'runtime-wasm-optional') }}
2222
- name: isiOSLikeOnlyBuild
23-
value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike', 'runtime-ioslike-mono', 'runtime-ioslike-coreclr') }}
23+
value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike') }}
2424
- name: isiOSLikeSimulatorOnlyBuild
2525
value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslikesimulator') }}
2626
- name: isAndroidOnlyBuild
@@ -32,14 +32,14 @@ variables:
3232
- name: isLinuxBionicOnlyBuild
3333
value: ${{ in(variables['Build.DefinitionName'], 'runtime-linuxbionic') }}
3434
- name: isRunSmokeTestsOnly
35-
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') }}
35+
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') }}
3636
- name: isNotSpecificPlatformOnlyBuild
37-
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') }}
37+
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') }}
3838

3939
# We only run evaluate paths on runtime and runtime-community pipelines on PRs
4040
# keep in sync with /eng/pipelines/common/xplat-setup.yml
4141
- name: dependOnEvaluatePaths
42-
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')) }}
42+
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')) }}
4343
- name: debugOnPrReleaseOnRolling
4444
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
4545
value: Release

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

Lines changed: 108 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -7,120 +7,116 @@ parameters:
77
isExtraPlatformsBuild: false
88
isiOSLikeOnlyBuild: false
99
isRollingBuild: false
10-
isMonoOnlyBuild: false
11-
isCoreclrOnlyBuild: false
1210

1311
jobs:
1412

15-
- ${{ if eq(parameters.isCoreclrOnlyBuild, false) }}:
16-
#
17-
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
18-
# Build the whole product using Mono and run libraries tests
19-
#
20-
- template: /eng/pipelines/common/platform-matrix.yml
21-
parameters:
22-
jobTemplate: /eng/pipelines/common/global-build-job.yml
23-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
24-
buildConfig: Release
25-
runtimeFlavor: mono
26-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
27-
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
28-
platforms:
29-
- ios_arm64
30-
- tvos_arm64
31-
variables:
32-
# map dependencies variables to local variables
33-
- name: librariesContainsChange
34-
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
35-
- name: monoContainsChange
36-
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
37-
jobParameters:
38-
testGroup: innerloop
39-
nameSuffix: AllSubsets_Mono
40-
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
41-
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
42-
timeoutInMinutes: 180
43-
# extra steps, run tests
44-
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
45-
extraStepsParameters:
46-
creator: dotnet-bot
47-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
48-
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
13+
#
14+
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
15+
# Build the whole product using Mono and run libraries tests
16+
#
17+
- template: /eng/pipelines/common/platform-matrix.yml
18+
parameters:
19+
jobTemplate: /eng/pipelines/common/global-build-job.yml
20+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
21+
buildConfig: Release
22+
runtimeFlavor: mono
23+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
24+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
25+
platforms:
26+
- ios_arm64
27+
- tvos_arm64
28+
variables:
29+
# map dependencies variables to local variables
30+
- name: librariesContainsChange
31+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
32+
- name: monoContainsChange
33+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
34+
jobParameters:
35+
testGroup: innerloop
36+
nameSuffix: AllSubsets_Mono
37+
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
38+
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
39+
timeoutInMinutes: 180
40+
# extra steps, run tests
41+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
42+
extraStepsParameters:
43+
creator: dotnet-bot
44+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
45+
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
4946

50-
#
51-
# Build the whole product using Mono for iOS/tvOS and run runtime tests with iOS/tvOS devices
52-
#
53-
- template: /eng/pipelines/common/platform-matrix.yml
54-
parameters:
55-
jobTemplate: /eng/pipelines/common/global-build-job.yml
56-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
57-
buildConfig: Release
58-
runtimeFlavor: mono
59-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
60-
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
61-
platforms:
62-
- ios_arm64
63-
- tvos_arm64
64-
variables:
65-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
66-
- name: _HelixSource
67-
value: pr/dotnet/runtime/$(Build.SourceBranch)
68-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
69-
- name: _HelixSource
70-
value: ci/dotnet/runtime/$(Build.SourceBranch)
71-
- name: timeoutPerTestInMinutes
72-
value: 60
73-
- name: timeoutPerTestCollectionInMinutes
74-
value: 180
75-
jobParameters:
76-
testGroup: innerloop
77-
nameSuffix: AllSubsets_Mono_RuntimeTests
78-
buildArgs: -s mono+libs -c $(_BuildConfig)
79-
timeoutInMinutes: 240
80-
# extra steps, run tests
81-
extraVariablesTemplates:
82-
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
83-
parameters:
84-
testGroup: innerloop
85-
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
86-
extraStepsParameters:
87-
creator: dotnet-bot
88-
# 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
89-
testBuildArgs: tree tracing/eventpipe
90-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
47+
#
48+
# Build the whole product using Mono for iOS/tvOS and run runtime tests with iOS/tvOS devices
49+
#
50+
- template: /eng/pipelines/common/platform-matrix.yml
51+
parameters:
52+
jobTemplate: /eng/pipelines/common/global-build-job.yml
53+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
54+
buildConfig: Release
55+
runtimeFlavor: mono
56+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
57+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
58+
platforms:
59+
- ios_arm64
60+
- tvos_arm64
61+
variables:
62+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
63+
- name: _HelixSource
64+
value: pr/dotnet/runtime/$(Build.SourceBranch)
65+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
66+
- name: _HelixSource
67+
value: ci/dotnet/runtime/$(Build.SourceBranch)
68+
- name: timeoutPerTestInMinutes
69+
value: 60
70+
- name: timeoutPerTestCollectionInMinutes
71+
value: 180
72+
jobParameters:
73+
testGroup: innerloop
74+
nameSuffix: AllSubsets_Mono_RuntimeTests
75+
buildArgs: -s mono+libs -c $(_BuildConfig)
76+
timeoutInMinutes: 240
77+
# extra steps, run tests
78+
extraVariablesTemplates:
79+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
80+
parameters:
81+
testGroup: innerloop
82+
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
83+
extraStepsParameters:
84+
creator: dotnet-bot
85+
# 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
86+
testBuildArgs: tree tracing/eventpipe
87+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
9188

92-
- ${{ if eq(parameters.isMonoOnlyBuild, false) }}:
93-
#
94-
# Build the whole product using NativeAOT for iOS/tvOS and run runtime tests with iOS/tvOS devices
95-
#
96-
- template: /eng/pipelines/common/platform-matrix.yml
97-
parameters:
98-
jobTemplate: /eng/pipelines/common/global-build-job.yml
99-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
100-
buildConfig: Release
101-
runtimeFlavor: coreclr
102-
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
103-
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
104-
platforms:
105-
- ios_arm64
106-
- tvos_arm64
107-
variables:
108-
- name: timeoutPerTestInMinutes
109-
value: 60
110-
- name: timeoutPerTestCollectionInMinutes
111-
value: 180
112-
jobParameters:
113-
testGroup: innerloop
114-
nameSuffix: AllSubsets_NativeAOT_RuntimeTests
115-
timeoutInMinutes: 240
116-
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs -c $(_BuildConfig)
117-
# extra steps, run tests
118-
extraVariablesTemplates:
119-
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
120-
parameters:
121-
testGroup: innerloop
122-
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
123-
extraStepsParameters:
124-
creator: dotnet-bot
125-
testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
126-
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
89+
#
90+
# Build the whole product using NativeAOT for iOS/tvOS and run runtime tests with iOS/tvOS devices
91+
#
92+
- template: /eng/pipelines/common/platform-matrix.yml
93+
parameters:
94+
jobTemplate: /eng/pipelines/common/global-build-job.yml
95+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
96+
buildConfig: Release
97+
runtimeFlavor: coreclr
98+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
99+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
100+
platforms:
101+
- ios_arm64
102+
- tvos_arm64
103+
variables:
104+
- name: timeoutPerTestInMinutes
105+
value: 60
106+
- name: timeoutPerTestCollectionInMinutes
107+
value: 180
108+
jobParameters:
109+
testGroup: innerloop
110+
nameSuffix: AllSubsets_NativeAOT_RuntimeTests
111+
timeoutInMinutes: 240
112+
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs -c $(_BuildConfig)
113+
# extra steps, run tests
114+
extraVariablesTemplates:
115+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
116+
parameters:
117+
testGroup: innerloop
118+
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
119+
extraStepsParameters:
120+
creator: dotnet-bot
121+
testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
122+
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)

eng/pipelines/runtime-ioslike-coreclr.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

eng/pipelines/runtime-ioslike-mono.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)