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.

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

Replace Android CI vmImage: 'MacOS-12' with vmImage: 'ubuntu-latest' #21172

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Next Next commit
vmImage: 'ubuntu-latest'
  • Loading branch information
jchen351 committed Jun 25, 2024
commit b4b6f1229d4db5bc6ae9bcfbd4df19ab8a0aad10
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,11 @@ stages:
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'ubuntu-latest'
workspace:
clean: all
condition: succeeded()
steps:
- script: |
set -ex
system_profiler SPSoftwareDataType SPHardwareDataType
displayName: 'Mac Agent Info'

- task: DownloadPipelineArtifact@2
inputs:
${{ if eq(parameters.specificArtifact, true) }}:
Expand Down Expand Up @@ -257,10 +252,10 @@ stages:

- template: "templates/use-android-ndk.yml"

- template: templates/use-android-emulator.yml
parameters:
create: true
start: true
# - template: templates/use-android-emulator.yml
# parameters:
# create: true
# start: true

- script: |
python3 tools/ci_build/build.py \
Expand All @@ -274,26 +269,23 @@ stages:
--test
displayName: CPU EP, Test on Android Emulator

- template: templates/use-android-emulator.yml
parameters:
stop: true
# - template: templates/use-android-emulator.yml
# parameters:
# stop: true

- template: templates/clean-agent-build-directory-step.yml

- job: Test_NNAPI_EP
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'ubuntu-latest'

timeoutInMinutes: 90
workspace:
clean: all
condition: and(succeeded(), notIn(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
steps:
- script: |
set -ex
system_profiler SPSoftwareDataType SPHardwareDataType
displayName: 'Mac Agent Info'

- task: DownloadPipelineArtifact@2
inputs:
Expand Down Expand Up @@ -322,11 +314,6 @@ stages:

- template: "templates/use-android-ndk.yml"

- template: templates/use-android-emulator.yml
parameters:
create: true
start: true

- script: |
python3 tools/ci_build/build.py \
--android \
Expand All @@ -348,10 +335,6 @@ stages:
# Build Minimal ORT with NNAPI and reduced Ops, run unit tests on Android Emulator
displayName: Build Minimal ORT with NNAPI and run tests

- template: templates/use-android-emulator.yml
parameters:
stop: true

- template: templates/clean-agent-build-directory-step.yml

- stage: MASTER_BUILD_STAGE
Expand All @@ -365,17 +348,12 @@ stages:
pool:
# We need macOS-12 to run the Android emulator for now.
# https://github.com/actions/runner-images/issues/7671
vmImage: 'macOS-12'
vmImage: 'ubuntu-latest'
timeoutInMinutes: 180
workspace:
clean: all
condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
steps:
- script: |
set -ex
system_profiler SPSoftwareDataType SPHardwareDataType
displayName: 'Mac Agent Info'

- task: UsePythonVersion@0
displayName: Use Python $(pythonVersion)
inputs:
Expand All @@ -394,11 +372,6 @@ stages:
- script: brew install coreutils ninja
displayName: Install coreutils and ninja

- template: templates/use-android-emulator.yml
parameters:
create: true
start: true

- script: |
python3 tools/ci_build/build.py \
--android \
Expand Down Expand Up @@ -436,10 +409,6 @@ stages:
# Build Minimal ORT with NNAPI and reduced Ops, run unit tests on Android Emulator
displayName: Build Minimal ORT with NNAPI and run tests

- template: templates/use-android-emulator.yml
parameters:
stop: true

- template: templates/clean-agent-build-directory-step.yml

- job: Update_Dashboard
Expand Down
Loading