Skip to content

Commit

Permalink
[ci] Last move sequoia (#28029)
Browse files Browse the repository at this point in the history
* [ci] Move device tests to Sequoia

* [ci] Fix provisioning uitests

* [ci] Move templates to Sequoia

* [ci] Make sure to run iOS tests on 18.0 simulators
  • Loading branch information
rmarinho authored Feb 25, 2025
1 parent e63f9e1 commit 34f877e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
8 changes: 3 additions & 5 deletions eng/pipelines/common/maui-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
name: $(POOL_NAME)
vmImage: $(POOL_VIMAGE)
demands:
- macOS.Name -equals Sonoma
- macOS.Name -equals Sequoia
- macOS.Architecture -equals arm64
steps:
- template: maui-templates-steps.yml
Expand Down Expand Up @@ -157,23 +157,21 @@ jobs:
DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
PRIVATE_BUILD: $(PrivateBuild)

# - script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "9.0.0-prerelease*" -g
# displayName: install xharness

- ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
- pwsh: ./build.ps1 -Script eng/devices/ios.cake --target=Cleanup --verbosity=diagnostic
displayName: Reset iOS simulators
# TODO: pass properly device type/version from top-level yml
env:
IOS_TEST_DEVICE: ios-simulator-64_17.2
IOS_TEST_DEVICE: ios-simulator-64_18.0

- pwsh: ./build.ps1 --target=dotnet-integration-test --filter="Category=${{ RunPlatform.testName }}" --resultsfilename="integration-run-${{ RunPlatform.testName }}" --verbosity=diagnostic
displayName: Run ${{ RunPlatform.testName }} templates run tests
continueOnError: true
# TODO: pass properly device type/version from top-level yml
${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
env:
IOS_TEST_DEVICE: ios-simulator-64_17.2
IOS_TEST_DEVICE: ios-simulator-64_18.0

- ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
- pwsh: ./build.ps1 --target=Cleanup -Script eng/devices/ios.cake ---results="$(TestResultsDirectory)" ${{ parameters.cakeArgs }}
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/device-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ parameters:
name: $(androidTestsVmPool)
vmImage: $(androidTestsVmImage)
demands:
- macOS.Name -equals Sonoma
- macOS.Name -equals Sequoia

- name: androidPoolX64
type: object
Expand All @@ -84,15 +84,15 @@ parameters:
name: $(iosDeviceTestsVmPool)
vmImage: $(iosDeviceTestsVmImage)
demands:
- macOS.Name -equals Sonoma
- macOS.Name -equals Sequoia

- name: catalystPool
type: object
default:
name: $(iosDeviceTestsVmPool)
vmImage: $(iosDeviceTestsVmImage)
demands:
- macOS.Name -equals Sonoma
- macOS.Name -equals Sequoia

- name: windowsPool
type: object
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ stages:
provisionatorChannel: ${{ parameters.provisionatorChannel }}
${{ if parameters.CompatibilityTests }}:
runCompatibilityTests: true
${{ if or(eq(parameters.UseProvisionator, true), eq(variables['internalProvisioning'],'True') ) }}:
${{ if or(parameters.UseProvisionator, eq(variables['internalProvisioning'],'true') ) }}:
skipProvisioning: false
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
${{ else }}:
Expand Down

0 comments on commit 34f877e

Please sign in to comment.