Change MacOS-13 to ubuntu on for android-java-api-aar-test.yml. (#23444)

### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
This commit is contained in:
Jian Chen 2025-01-21 20:07:20 -05:00 committed by GitHub
parent 58c29d34b2
commit 628c0e00c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 16 deletions

View file

@ -4,11 +4,6 @@ parameters:
type: string
default: ''
- name: job_name_suffix
displayName: job name
type: string
default: ''
- name: packageName
displayName: Package Name
type: string
@ -25,17 +20,13 @@ parameters:
default: '2.30.0.250109'
jobs:
- job: Final_AAR_Testing_Android_${{ parameters.job_name_suffix }}
- job: Final_AAR_Testing_Android
pool: 'onnxruntime-Ubuntu2204-AMD-CPU'
workspace:
clean: all
pool:
vmImage: 'macOS-13'
variables:
- name: runCodesignValidationInjection
value: false
runCodesignValidationInjection: false
timeoutInMinutes: 90
dependsOn:
- Android_Java_API_AAR_Packaging_${{ parameters.job_name_suffix }}
steps:
- template: set-version-number-variables-step.yml

View file

@ -82,10 +82,12 @@ stages:
packageName: 'onnxruntime-android'
ReleaseVersionSuffix: $(ReleaseVersionSuffix)
- stage: Android_Java_API_AAR_Testing_Full
dependsOn: Android_Java_API_AAR_Packaging_Full
jobs:
- template: android-java-api-aar-test.yml
parameters:
artifactName: 'onnxruntime-android-full-aar'
job_name_suffix: 'Full'
ReleaseVersionSuffix: $(ReleaseVersionSuffix)
- stage: Android_Java_API_AAR_Packaging_QNN
@ -105,10 +107,12 @@ stages:
ReleaseVersionSuffix: $(ReleaseVersionSuffix)
QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
- stage: Final_AAR_Testing_Android_QNN
dependsOn: Android_Java_API_AAR_Packaging_QNN
jobs:
- template: android-java-api-aar-test.yml
parameters:
artifactName: 'onnxruntime-android-qnn-aar'
job_name_suffix: 'QNN'
packageName: 'onnxruntime-android-qnn'
QnnSDKVersion: ${{ parameters.QnnSDKVersion }}

View file

@ -102,10 +102,12 @@ stages:
packageName: onnxruntime-training-android
enable_code_sign: true
- stage: Final_AAR_Testing_Android_Training_Full
dependsOn: Android_Java_API_AAR_Packaging_Training_Full
jobs:
- template: android-java-api-aar-test.yml
parameters:
artifactName: 'onnxruntime-training-android-full-aar'
job_name_suffix: 'Training_Full'
packageName: onnxruntime-training-android
- stage: NuGet_Packaging_Training_CPU
@ -115,7 +117,7 @@ stages:
- Windows_Packaging_Training_CPU_x86_${{ parameters.BuildVariant }}
- Windows_Packaging_Training_CPU_x64_${{ parameters.BuildVariant }}
- Windows_Packaging_Training_CPU_arm64_${{ parameters.BuildVariant }}
- Android_Java_API_AAR_Packaging_Training_Full
- Final_AAR_Testing_Android_Training_Full
condition: succeeded()
jobs:
- job: NuGet_Packaging_Training_CPU