Skip to content

Commit 71fe60e

Browse files
authored
User/alexlam/arm64mitigation main 251015 (#5908)
* Conditionally include Test_arm64 stage * Refactor Test_arm64 stage to use conditional syntax * Change default for arm64 sample tests to false Temporarily set default to not test on arm64 to address capacity issues. * Update default setting for arm64 sample tests Temporarily change default for arm64 tests to false due to capacity issues. * Change arm64 test setting default to false * Update display name for arm64 test configuration * Update display name for arm64 test configuration
1 parent bd3cc2e commit 71fe60e

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ stages:
2222
dependsOn:
2323
- Test_x86
2424
- Test_x64
25-
- Test_arm64
25+
- ${{ if eq(parameters.TestOnArm64, true)}}:
26+
- Test_arm64
2627
- StaticValidationTest
2728
- ${{ if and(eq( parameters.TestSampleApps, true ), eq( parameters.MaestroDependOnTestSamples, true )) }}:
2829
- TestSampleApps_x64
@@ -43,4 +44,4 @@ stages:
4344
- template: AzurePipelinesTemplates/WindowsAppSDK-PublishToMaestro-Steps.yml@WindowsAppSDKConfig
4445
parameters:
4546
NuGetArtifactNames:
46-
- 'TransportPackage'
47+
- 'TransportPackage'

build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ stages:
1919
testMatrix: $[ stageDependencies.Build_x64.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
2020
buildPlatform: x64
2121

22-
- stage: Test_arm64
23-
dependsOn: Build_arm64
24-
condition: not(failed())
25-
jobs:
26-
- template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
27-
parameters:
28-
jobName: PipelineTests
29-
testMatrix: $[ stageDependencies.Build_arm64.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
30-
buildPlatform: arm64
22+
- ${{ if eq(parameters.TestOnArm64, true)}}:
23+
- stage: Test_arm64
24+
dependsOn: Build_arm64
25+
condition: not(failed())
26+
jobs:
27+
- template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
28+
parameters:
29+
jobName: PipelineTests
30+
testMatrix: $[ stageDependencies.Build_arm64.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
31+
buildPlatform: arm64

build/WindowsAppSDK-Foundation-Nightly.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ parameters:
4242
type: boolean
4343
default: true
4444
- name: "TestOnArm64"
45-
displayName: "Enable running of sample tests on arm64 platform (Default: true)"
45+
displayName: "Enable running of tests on arm64 platform (Default: false)"
4646
type: boolean
47-
default: true
47+
# Temporarily default to not testing on arm64 to mitigate arm64 capacity shortage problem.
48+
default: false
4849
- name: "MaestroDependOnTestSamples"
4950
displayName: "Whether Maestro publishing should depend on successful Sample tests"
5051
type: boolean
@@ -179,4 +180,4 @@ extends:
179180
TestOnArm64: ${{ parameters.TestOnArm64 }}
180181
runStaticAnalysis: ${{ parameters.runStaticAnalysis }}
181182
maxParallel_x64: ${{ variables.maxParallelForBuildSamplesCompatJob_x64 }}
182-
maxParallel_arm64: ${{ variables.maxParallelForBuildSamplesCompatJob_arm64 }}
183+
maxParallel_arm64: ${{ variables.maxParallelForBuildSamplesCompatJob_arm64 }}

build/WindowsAppSDK-Foundation-Official.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ parameters:
4242
type: boolean
4343
default: true
4444
- name: "TestOnArm64"
45-
displayName: "Enable running of sample tests on arm64 platform (Default: true)"
45+
displayName: "Enable running of tests on arm64 platform (Default: false)"
4646
type: boolean
47-
default: true
47+
# Temporarily default to not testing on arm64 to mitigate arm64 capacity shortage problem.
48+
default: false
4849
- name: "MaestroDependOnTestSamples"
4950
displayName: "Whether Maestro publishing should depend on successful Sample tests"
5051
type: boolean
@@ -162,4 +163,4 @@ extends:
162163
TestOnArm64: ${{ parameters.TestOnArm64 }}
163164
runStaticAnalysis: ${{ parameters.runStaticAnalysis }}
164165
maxParallel_x64: ${{ variables.maxParallelForBuildSamplesCompatJob_x64 }}
165-
maxParallel_arm64: ${{ variables.maxParallelForBuildSamplesCompatJob_arm64 }}
166+
maxParallel_arm64: ${{ variables.maxParallelForBuildSamplesCompatJob_arm64 }}

build/WindowsAppSDK-Foundation-PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2929
type: boolean
3030
default: false
3131
- name: "TestOnArm64"
32-
displayName: "Enable running of sample tests on arm64 platform (Default: true)"
32+
displayName: "Enable running of tests on arm64 platform (Default: false)"
3333
type: boolean
3434
default: false
3535
- name: runStaticAnalysis

0 commit comments

Comments
 (0)