Skip to content

[ci] Fix nightly test environment provisioning #8113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjcollins merged 3 commits into from
Jun 7, 2023
Merged

[ci] Fix nightly test environment provisioning #8113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb0902b
[ci] Fix nightly test environment provisioning
pjcollins Jun 6, 2023
53a0064
Fix spacing
pjcollins Jun 6, 2023
b4a163b
Pass extra launch args to both start steps
pjcollins Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,10 @@ stages:
steps:
- template: yaml-templates/setup-test-environment.yaml
parameters:
configuration: $(XA.Build.Configuration)

- template: yaml-templates/run-xaprepare.yaml
parameters:
displayName: install emulator
arguments: --s=EmulatorTestDependencies
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies

- template: yaml-templates/run-dotnet-preview.yaml
parameters:
Expand All @@ -127,12 +125,12 @@ stages:
- script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
displayName: set Java8SdkDirectory

- task: MSBuild@1
displayName: install and launch emulator
inputs:
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
configuration: $(XA.Build.Configuration)
msbuildArguments: /t:InstallAvdImage;AcquireAndroidTarget /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-$(avdApiLevel).binlog
- template: yaml-templates/start-stop-emulator.yaml
parameters:
specificImage: true
avdApiLevel: $(avdApiLevel)
avdAbi: $(avdAbi)
avdType: $(avdType)

- template: yaml-templates/apk-instrumentation.yaml
parameters:
Expand All @@ -144,14 +142,6 @@ stages:
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: Mono.Android-$(XA.Build.Configuration)-$(avdApiLevel)

- task: MSBuild@1
displayName: shut down emulator
inputs:
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
configuration: $(XA.Build.Configuration)
msbuildArguments: /t:AcquireAndroidTarget,ReleaseAndroidTarget /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
condition: always()

- template: yaml-templates/upload-results.yaml
parameters:
configuration: $(XA.Build.Configuration)
Expand Down
27 changes: 7 additions & 20 deletions build-tools/automation/yaml-templates/run-emulator-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,23 @@ jobs:
clean: all
steps:
- template: setup-test-environment.yaml

- template: run-xaprepare.yaml
parameters:
arguments: --s=EmulatorTestDependencies
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies

- task: DownloadPipelineArtifact@2
inputs:
artifactName: $(TestAssembliesArtifactName)
downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)

- task: MSBuild@1
displayName: start emulator
inputs:
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
configuration: $(XA.Build.Configuration)
msbuildArguments: >-
/t:AcquireAndroidTarget ${{ parameters.emulatorMSBuildArgs }} /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog
- template: start-stop-emulator.yaml
parameters:
emulatorMSBuildArgs: ${{ parameters.emulatorMSBuildArgs }}

- ${{ parameters.testSteps }}

- task: MSBuild@1
displayName: shut down emulator
inputs:
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
configuration: $(XA.Build.Configuration)
msbuildArguments: >-
/t:AcquireAndroidTarget,ReleaseAndroidTarget
/bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
condition: always()

- template: upload-results.yaml
parameters:
artifactName: Test Results - ${{ parameters.jobName }} With Emulator - macOS
Expand Down
56 changes: 0 additions & 56 deletions build-tools/automation/yaml-templates/run-localization-tests.yaml
View file
Open in desktop

This file was deleted.

31 changes: 27 additions & 4 deletions build-tools/automation/yaml-templates/start-stop-emulator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ parameters:
avdApiLevel: # Device API level, like '30', required if 'specificImage' is 'true'
avdAbi: # Device ABI, like 'x86', required if 'specificImage' is 'true'
avdType: # Device AVD, like 'android-wear', required if 'specificImage' is 'true'
emulatorMSBuildArgs: # Extra args to pass to the emulator configuration like '-p:TestAvdExtraBootArgs=-writable-system', optional
launchTimeoutMin: 20 # Minutes to wait for the emulator to start
xaSourcePath: $(System.DefaultWorkingDirectory) # working directory

Expand All @@ -16,9 +17,21 @@ steps:
inputs:
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
${{ if eq(parameters.specificImage, true) }}:
arguments: -c $(XA.Build.Configuration) -t:"InstallAvdImage;AcquireAndroidTarget" -p:TestDeviceName=${{ parameters.deviceName }} -p:TestAvdApiLevel=${{ parameters.avdApiLevel }} -p:TestAvdAbi=${{ parameters.avdAbi }} -p:TestAvdType=${{ parameters.avdType }} -p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-${{ parameters.avdApiLevel }}.binlog
arguments: >-
-c $(XA.Build.Configuration) -t:"InstallAvdImage;AcquireAndroidTarget"
-p:TestDeviceName=${{ parameters.deviceName }}
-p:TestAvdApiLevel=${{ parameters.avdApiLevel }}
-p:TestAvdAbi=${{ parameters.avdAbi }}
-p:TestAvdType=${{ parameters.avdType }}
${{ parameters.emulatorMSBuildArgs }}
-p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }}
-bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-${{ parameters.avdApiLevel }}.binlog
${{ else }}:
arguments: -c $(XA.Build.Configuration) -t:AcquireAndroidTarget -p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog
arguments: >-
-c $(XA.Build.Configuration) -t:AcquireAndroidTarget
${{ parameters.emulatorMSBuildArgs }}
-p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }}
-bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog

- ${{ if eq(parameters.command, 'stop') }}:
- task: DotNetCoreCLI@2
Expand All @@ -28,6 +41,16 @@ steps:
inputs:
projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
${{ if eq(parameters.specificImage, true) }}:
arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -p:TestDeviceName=${{ parameters.deviceName }} -p:TestAvdApiLevel=${{ parameters.avdApiLevel }} -p:TestAvdAbi=${{ parameters.avdAbi }} -p:TestAvdType=${{ parameters.avdType }} -p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
arguments: >-
-c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget"
-p:TestDeviceName=${{ parameters.deviceName }}
-p:TestAvdApiLevel=${{ parameters.avdApiLevel }}
-p:TestAvdAbi=${{ parameters.avdAbi }}
-p:TestAvdType=${{ parameters.avdType }}
-p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }}
-bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
${{ else }}:
arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
arguments: >-
-c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget"
-p:AvdLaunchTimeoutMinutes=${{ parameters.launchTimeoutMin }}
-bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog