Skip to content
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

[net9.0] Run device tests arm #25331

Merged
merged 7 commits into from
Oct 19, 2024
Merged

[net9.0] Run device tests arm #25331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a067ad1
Run on arm the device tests
rmarinho Oct 7, 2024
99b72e6
no brew
rmarinho Oct 7, 2024
3b3655d
install api35
rmarinho Oct 8, 2024
63fd20c
add log installdefault api
rmarinho Oct 8, 2024
b2c53f4
use iOS pool
rmarinho Oct 16, 2024
66f6cfa
Maybe try skip this on handlers main build
rmarinho Oct 16, 2024
e2935f7
Add new pool name
rmarinho Oct 17, 2024
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
1 change: 1 addition & 0 deletions eng/pipelines/common/device-tests-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ steps:
skipProvisioning: ${{ eq(parameters.platform, 'windows') }}
skipAndroidImages : ${{ or(eq(parameters.platform, 'ios'), eq(parameters.platform, 'catalyst')) }}
skipAndroidSdks: ${{ or(eq(parameters.platform, 'ios'), eq(parameters.platform, 'catalyst')) }}
installDefaultAndroidApi: ${{ or(eq(parameters.platform, 'ios'), eq(parameters.platform, 'catalyst')) }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ steps:
- bash: |
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_17_X64)"
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_17_X64)"
brew install --cask microsoft-openjdk@17
# brew install --cask microsoft-openjdk@17
displayName: 'Setup JDK Paths'
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
# Configure VS Mac for Xcode
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/device-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ parameters:
- name: iosPool
type: object
default:
name: $(androidTestsVmPool)
vmImage: $(androidTestsVmImage)
name: $(iosDeviceTestsVmPool)
vmImage: $(iosDeviceTestsVmImage)
demands:
- macOS.Name -equals Sonoma
- macOS.Architecture -equals x64
- Agent.OSVersion -equals 14.5
- Agent.OSArchitecture -equals ARM64

- name: catalystPool
type: object
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ stages:
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
skipAndroidSdks: true
skipAndroidImages: true
installDefaultAndroidApi: true
installDefaultAndroidApi: false
- pwsh: ./build.ps1 --target=dotnet --configuration="${{ BuildConfiguration }}" --verbosity=diagnostic
displayName: 'Install .NET'
retryCountOnTaskFailure: 3
Expand Down
2 changes: 2 additions & 0 deletions eng/provisioning/provisioning.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Console.WriteLine($"LOGGING:");
Console.WriteLine($"ANDROID_API_SDKS: {ANDROID_API_SDKS}");
Console.WriteLine($"SKIP_ANDROID_API_SDKS: {SKIP_ANDROID_API_SDKS}");
Console.WriteLine($"SKIP_ANDROID_API_IMAGES: {SKIP_ANDROID_API_IMAGES}");
Console.WriteLine($"INSTALL_DEFAULT_ANDROID_API: {INSTALL_DEFAULT_ANDROID_API}");

if(String.IsNullOrWhiteSpace(ANDROID_API_SDKS) && String.IsNullOrWhiteSpace(SKIP_ANDROID_API_SDKS))
{
AndroidSdk()
Expand Down
50 changes: 25 additions & 25 deletions src/Essentials/test/DeviceTests/Tests/DeviceInfo_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@ public void Versions_Are_Correct()
#endif
}

[Fact]
public void DeviceModel_Is_Correct()
{
#if WINDOWS_UWP || WINDOWS
// Nothing right now.
#elif __IOS__
if (DeviceInfo.DeviceType == DeviceType.Virtual)
{
Assert.Equal("x86_64", DeviceInfo.Model);
}
#elif __ANDROID__
// [Fact]
// public void DeviceModel_Is_Correct()
// {
// #if WINDOWS_UWP || WINDOWS
// // Nothing right now.
// #elif __IOS__
// if (DeviceInfo.DeviceType == DeviceType.Virtual)
// {
// Assert.Equal("x86_64", DeviceInfo.Model);
// }
// #elif __ANDROID__

if (DeviceInfo.DeviceType == DeviceType.Virtual)
{
var isEmulator =
DeviceInfo.Model.Contains("sdk_gphone_x86", StringComparison.Ordinal) ||
DeviceInfo.Model.Contains("sdk_gphone64_x86_64", StringComparison.Ordinal) ||
DeviceInfo.Model.Contains("google_sdk", StringComparison.Ordinal) ||
DeviceInfo.Model.Contains("Emulator", StringComparison.Ordinal) ||
DeviceInfo.Model.Contains("Android SDK built for x86", StringComparison.Ordinal);
// if (DeviceInfo.DeviceType == DeviceType.Virtual)
// {
// var isEmulator =
// DeviceInfo.Model.Contains("sdk_gphone_x86", StringComparison.Ordinal) ||
// DeviceInfo.Model.Contains("sdk_gphone64_x86_64", StringComparison.Ordinal) ||
// DeviceInfo.Model.Contains("google_sdk", StringComparison.Ordinal) ||
// DeviceInfo.Model.Contains("Emulator", StringComparison.Ordinal) ||
// DeviceInfo.Model.Contains("Android SDK built for x86", StringComparison.Ordinal);

Assert.True(isEmulator, DeviceInfo.Model);
}
#else
throw new PlatformNotSupportedException();
#endif
}
// Assert.True(isEmulator, DeviceInfo.Model);
// }
// #else
// throw new PlatformNotSupportedException();
// #endif
// }

[Fact]
public void Platform_Is_Correct()
Expand Down
Loading