Skip to content

Commit 4720184

Browse files
jpobstjpobst
committed
Don't install unneeded things.
1 parent b83a680 commit 4720184

File tree

4 files changed

+65
-34
lines changed

4 files changed

+65
-34
lines changed

‎build-tools/automation/yaml-templates/setup-test-environment.yaml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ parameters:
88
jdkTestFolder: $(JAVA_HOME_11_X64)
99
remove_dotnet: false
1010
installTestSlicer: false
11+
installApkDiff: true
12+
installLegacyDotNet: true
13+
restoreNUnitConsole: true
14+
androidSdkPlatforms: 19,21,26,32,33
1115

1216
steps:
1317
- checkout: self
@@ -40,11 +44,12 @@ steps:
4044
condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
4145

4246
# Install .NET 6 for legacy tests
43-
- template: use-dot-net.yaml
44-
parameters:
45-
version: 6.0
46-
quality: GA
47-
remove_dotnet: ${{ parameters.remove_dotnet }}
47+
- ${{ if eq(parameters.installLegacyDotNet, true) }}:
48+
- template: use-dot-net.yaml
49+
parameters:
50+
version: 6.0
51+
quality: GA
52+
remove_dotnet: ${{ parameters.remove_dotnet }}
4853

4954
# Install latest .NET
5055
- template: use-dot-net.yaml
@@ -65,17 +70,18 @@ steps:
6570

6671
- template: run-xaprepare.yaml
6772
parameters:
68-
arguments: --s=AndroidTestDependencies --android-sdk-platforms="19,21,26,32,33"
73+
arguments: --s=AndroidTestDependencies --android-sdk-platforms="${{ parameters.androidSdkPlatforms }}"
6974
xaSourcePath: ${{ parameters.xaSourcePath }}
7075

71-
- task: DotNetCoreCLI@2
72-
displayName: restore NUnit.Console
73-
inputs:
74-
command: restore
75-
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
76-
restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.ProjectTools.binlog
77-
nugetConfigPath: ${{ parameters.xaSourcePath }}/NuGet.config
78-
feedsToUse: config
76+
- ${{ if eq(parameters.restoreNUnitConsole, true) }}:
77+
- task: DotNetCoreCLI@2
78+
displayName: restore NUnit.Console
79+
inputs:
80+
command: restore
81+
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
82+
restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.ProjectTools.binlog
83+
nugetConfigPath: ${{ parameters.xaSourcePath }}/NuGet.config
84+
feedsToUse: config
7985

8086
- task: DotNetCoreCLI@2
8187
displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
@@ -101,7 +107,8 @@ steps:
101107
projects: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
102108
arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog
103109

104-
- template: install-apkdiff.yaml
110+
- ${{ if eq(parameters.installApkDiff, true) }}:
111+
- template: install-apkdiff.yaml
105112

106113
- ${{ if eq(parameters.installTestSlicer, true) }}:
107114
- template: install-dotnet-test-slicer.yaml

‎build-tools/automation/yaml-templates/shut-down-emulator.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
parameters:
2+
releaseImage: false # 'true' to release a specific emulator, if 'true', other 'release*' parameters must be provided
3+
releaseDeviceName: # Device name to release, like 'wear_square'
4+
releaseAvdApiLevel: # Device API level to release, like '30'
5+
releaseAvdAbi: # Device ABI to release, like 'x86'
6+
releaseAvdType: # Device AVD to release, like 'android-wear'
7+
8+
steps:
9+
# This uses our in-tree 'dotnet' because the system one may not have the 'android' workload installed.
10+
- template: run-dotnet-preview.yaml
11+
parameters:
12+
displayName: Shut down emulator
13+
condition: always()
14+
continueOnError: true
15+
project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
16+
${{ if eq(parameters.releaseImage, true) }}:
17+
arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -p:TestDeviceName=${{ parameters.releaseDeviceName }} -p:TestAvdApiLevel=${{ parameters.releaseAvdApiLevel }} -p:TestAvdAbi=${{ parameters.releaseAvdAbi }} -p:TestAvdType=${{ parameters.releaseAvdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
18+
${{ else }}:
19+
arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog

‎build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ stages:
2626
cancelTimeoutInMinutes: 5
2727
workspace:
2828
clean: all
29+
variables:
30+
androidSdkPlatforms: 33
2931
steps:
3032
- template: setup-test-environment.yaml
3133
parameters:
3234
provisionClassic: false
3335
provisionatorChannel: ${{ parameters.provisionatorChannel }}
3436
installTestSlicer: true
37+
installApkDiff: false
38+
installLegacyDotNet: false
39+
restoreNUnitConsole: false
40+
androidSdkPlatforms: $(androidSdkPlatforms)
3541

3642
- template: run-xaprepare.yaml
3743
parameters:
3844
displayName: install emulator
39-
arguments: --s=EmulatorTestDependencies --android-sdk-platforms="19,21,26,32,33"
45+
arguments: --s=EmulatorTestDependencies --android-sdk-platforms="$(androidSdkPlatforms)"
4046

4147
- task: DownloadPipelineArtifact@2
4248
inputs:
@@ -62,15 +68,7 @@ stages:
6268
dotNetTestExtraArgs: --settings "$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.runsettings"
6369
testResultsFile: TestResult-MSBuildDeviceIntegration-${{ parameters.job_name }}-$(System.JobPositionInPhase)-$(XA.Build.Configuration).xml
6470

65-
- task: MSBuild@1
66-
displayName: shut down emulator
67-
inputs:
68-
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
69-
configuration: $(XA.Build.Configuration)
70-
msbuildArguments: >-
71-
/t:AcquireAndroidTarget,ReleaseAndroidTarget
72-
/bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
73-
condition: always()
71+
- template: shut-down-emulator.yaml
7472

7573
- template: upload-results.yaml
7674
parameters:
@@ -89,14 +87,21 @@ stages:
8987
avdAbi: x86
9088
avdType: android-wear
9189
deviceName: wear_square
90+
androidSdkPlatforms: 33
9291
pool:
9392
vmImage: $(HostedMacImage)
9493
workspace:
9594
clean: all
9695
steps:
9796
- template: setup-test-environment.yaml
9897
parameters:
98+
provisionClassic: false
99+
provisionatorChannel: ${{ parameters.provisionatorChannel }}
99100
configuration: $(XA.Build.Configuration)
101+
installApkDiff: false
102+
installLegacyDotNet: false
103+
restoreNUnitConsole: false
104+
androidSdkPlatforms: $(androidSdkPlatforms)
100105

101106
- template: run-xaprepare.yaml
102107
parameters:
@@ -106,7 +111,7 @@ stages:
106111
- template: run-xaprepare.yaml
107112
parameters:
108113
displayName: install emulator
109-
arguments: --s=EmulatorTestDependencies
114+
arguments: --s=EmulatorTestDependencies --android-sdk-platforms="$(androidSdkPlatforms)"
110115

111116
- script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
112117
displayName: set Java8SdkDirectory
@@ -131,13 +136,13 @@ stages:
131136
dotNetTestExtraArgs: --filter "TestCategory = WearOS"
132137
testResultsFile: TestResult-WearOS--$(XA.Build.Configuration).xml
133138

134-
- task: MSBuild@1
135-
displayName: shut down emulator
136-
inputs:
137-
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
138-
configuration: $(XA.Build.Configuration)
139-
msbuildArguments: /t:AcquireAndroidTarget,ReleaseAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
140-
condition: always()
139+
- template: shut-down-emulator.yaml
140+
parameters:
141+
releaseImage: true
142+
releaseDeviceName: $(deviceName)
143+
releaseAvdApiLevel: $(avdApiLevel)
144+
releaseAvdAbi: $(avdAbi)
145+
releaseAvdType: $(avdType)
141146

142147
- template: upload-results.yaml
143148
parameters:

‎build-tools/automation/yaml-templates/start-emulator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ steps:
1313
continueOnError: false
1414
project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
1515
${{ if eq(parameters.installImage, true) }}:
16-
arguments: -c $(XA.Build.Configuration) -t:InstallAvdImage;AcquireAndroidTarget -p:TestDeviceName=${{ parameters.installDeviceName }} -p:TestAvdApiLevel=${{ parameters.installAvdApiLevel }} -p:TestAvdAbi=${{ parameters.installAvdAbi }} -p:TestAvdType=${{ parameters.installAvdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-${{ parameters.installAvdApiLevel }}.binlog
16+
arguments: -c $(XA.Build.Configuration) -t:"InstallAvdImage;AcquireAndroidTarget" -p:TestDeviceName=${{ parameters.installDeviceName }} -p:TestAvdApiLevel=${{ parameters.installAvdApiLevel }} -p:TestAvdAbi=${{ parameters.installAvdAbi }} -p:TestAvdType=${{ parameters.installAvdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-${{ parameters.installAvdApiLevel }}.binlog
1717
${{ else }}:
1818
arguments: -c $(XA.Build.Configuration) -t:AcquireAndroidTarget -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog

0 commit comments

Comments
 (0)