Skip to content

Commit 4058c09

Browse files
[Android] Remove CoreCLR functional tests on Android from extra-platforms (#112496)
* Remove coreclr android job from extra-platforms --------- Co-authored-by: Matous Kozak <[email protected]>
1 parent 5c86aad commit 4058c09

File tree

2 files changed

+3
-34
lines changed

2 files changed

+3
-34
lines changed

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -118,35 +118,3 @@ jobs:
118118
parameters:
119119
creator: dotnet-bot
120120
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
121-
122-
#
123-
# Android emulators
124-
# Build the whole product using CoreCLR and run libraries tests
125-
#
126-
- template: /eng/pipelines/common/platform-matrix.yml
127-
parameters:
128-
jobTemplate: /eng/pipelines/common/global-build-job.yml
129-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
130-
buildConfig: Release
131-
runtimeFlavor: coreclr
132-
platforms:
133-
- android_x64
134-
- android_arm64
135-
variables:
136-
# map dependencies variables to local variables
137-
- name: librariesContainsChange
138-
value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
139-
- name: coreclrContainsChange
140-
value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'] ]
141-
jobParameters:
142-
testGroup: innerloop
143-
nameSuffix: AllSubsets_CoreCLR
144-
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
145-
buildArgs: -s clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:TestAssemblies=false
146-
timeoutInMinutes: 180
147-
# extra steps, run tests
148-
postBuildSteps:
149-
- template: /eng/pipelines/libraries/helix.yml
150-
parameters:
151-
creator: dotnet-bot
152-
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)

eng/pipelines/runtime.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -964,8 +964,8 @@ extends:
964964
eq(variables['isRollingBuild'], true))
965965
966966
#
967-
# Android devices
968-
# Build the whole product using CoreCLR and run libraries tests
967+
# Android arm64 devices and x64 emulators
968+
# Build the whole product using CoreCLR and run functional tests
969969
#
970970
- template: /eng/pipelines/common/platform-matrix.yml
971971
parameters:
@@ -990,6 +990,7 @@ extends:
990990
condition: >-
991991
or(
992992
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
993+
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
993994
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
994995
eq(variables['isRollingBuild'], true))
995996
# extra steps, run tests

0 commit comments

Comments
 (0)