Skip to content

Commit b3e4072

Browse files
committed
try enabling android runtime tests on devices
1 parent ff18c30 commit b3e4072

File tree

1 file changed

+76
-36
lines changed

1 file changed

+76
-36
lines changed

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

Lines changed: 76 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,82 @@ jobs:
1515
#
1616
# Turn off the runtime testing for now, until https://github.com/dotnet/runtime/issues/60128 gets resolved
1717
# don't run tests on PRs until we can get significantly more devices
18-
# - template: /eng/pipelines/common/platform-matrix.yml
19-
# parameters:
20-
# jobTemplate: /eng/pipelines/common/global-build-job.yml
21-
# helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
22-
# buildConfig: Release
23-
# runtimeFlavor: mono
24-
# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
25-
# isAndroidOnlyBuild: ${{ parameters.isAndroidOnlyBuild }}
26-
# platforms:
27-
# - android_arm64
28-
# variables:
29-
# - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
30-
# - name: _HelixSource
31-
# value: pr/dotnet/runtime/$(Build.SourceBranch)
32-
# - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
33-
# - name: _HelixSource
34-
# value: ci/dotnet/runtime/$(Build.SourceBranch)
35-
# - name: timeoutPerTestInMinutes
36-
# value: 60
37-
# - name: timeoutPerTestCollectionInMinutes
38-
# value: 180
39-
# jobParameters:
40-
# testGroup: innerloop
41-
# nameSuffix: AllSubsets_Mono_RuntimeTests
42-
# runtimeVariant: minijit
43-
# buildArgs: -s mono+libs -c $(_BuildConfig)
44-
# timeoutInMinutes: 480
45-
# ${{ if eq(variables['isRollingBuild'], true) }}:
46-
# # extra steps, run tests
47-
# postBuildSteps:
48-
# - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
49-
# parameters:
50-
# creator: dotnet-bot
51-
# testRunNamePrefixSuffix: Mono_$(_BuildConfig)
52-
# extraVariablesTemplates:
53-
# - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
18+
- template: /eng/pipelines/common/platform-matrix.yml
19+
parameters:
20+
jobTemplate: /eng/pipelines/common/global-build-job.yml
21+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
22+
buildConfig: Release
23+
runtimeFlavor: mono
24+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
25+
isAndroidOnlyBuild: ${{ parameters.isAndroidOnlyBuild }}
26+
platforms:
27+
- android_arm64
28+
variables:
29+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
30+
- name: _HelixSource
31+
value: pr/dotnet/runtime/$(Build.SourceBranch)
32+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
33+
- name: _HelixSource
34+
value: ci/dotnet/runtime/$(Build.SourceBranch)
35+
- name: timeoutPerTestInMinutes
36+
value: 60
37+
- name: timeoutPerTestCollectionInMinutes
38+
value: 180
39+
jobParameters:
40+
testGroup: innerloop
41+
nameSuffix: AllSubsets_Mono_RuntimeTests
42+
runtimeVariant: minijit
43+
buildArgs: -s mono+libs -c $(_BuildConfig)
44+
timeoutInMinutes: 480
45+
${{ if eq(variables['isRollingBuild'], true) }}:
46+
# extra steps, run tests
47+
postBuildSteps:
48+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
49+
parameters:
50+
creator: dotnet-bot
51+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
52+
extraVariablesTemplates:
53+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
54+
55+
#
56+
# Build the whole product using CoreCLR for Android and run runtime tests with Android devices
57+
#
58+
- template: /eng/pipelines/common/platform-matrix.yml
59+
parameters:
60+
jobTemplate: /eng/pipelines/common/global-build-job.yml
61+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
62+
buildConfig: Release
63+
runtimeFlavor: coreclr
64+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
65+
isAndroidOnlyBuild: ${{ parameters.isAndroidOnlyBuild }}
66+
platforms:
67+
- android_arm64
68+
variables:
69+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
70+
- name: _HelixSource
71+
value: pr/dotnet/runtime/$(Build.SourceBranch)
72+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
73+
- name: _HelixSource
74+
value: ci/dotnet/runtime/$(Build.SourceBranch)
75+
- name: timeoutPerTestInMinutes
76+
value: 60
77+
- name: timeoutPerTestCollectionInMinutes
78+
value: 180
79+
jobParameters:
80+
testGroup: innerloop
81+
nameSuffix: AllSubsets_CoreCLR_RuntimeTests
82+
runtimeVariant: minijit
83+
buildArgs: -s clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs+host+packs -c $(_BuildConfig)
84+
timeoutInMinutes: 480
85+
${{ if eq(variables['isRollingBuild'], true) }}:
86+
# extra steps, run tests
87+
postBuildSteps:
88+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
89+
parameters:
90+
creator: dotnet-bot
91+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
92+
extraVariablesTemplates:
93+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
5494

5595
#
5696
# Android devices

0 commit comments

Comments
 (0)