From b4b6f1229d4db5bc6ae9bcfbd4df19ab8a0aad10 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 25 Jun 2024 13:31:26 -0700 Subject: [PATCH 01/17] vmImage: 'ubuntu-latest' --- ...ndroid-x86_64-crosscompile-ci-pipeline.yml | 53 ++++--------------- 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 54e83b03aa61..66b16970f5af 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -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) }}: @@ -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 \ @@ -274,9 +269,9 @@ 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 @@ -284,16 +279,13 @@ 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: 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: @@ -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 \ @@ -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 @@ -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: @@ -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 \ @@ -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 From 99e2f7a04d8f9bb31042ce6104a5441decb00f3e Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 25 Jun 2024 15:13:40 -0700 Subject: [PATCH 02/17] start_emulator --- .../android-x86_64-crosscompile-ci-pipeline.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 66b16970f5af..8dbd50b9d892 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -265,6 +265,7 @@ stages: --android_ndk_path $ANDROID_NDK_HOME \ --android_abi=x86_64 \ --android_api=30 \ + --android_run_emulator \ --build_java \ --test displayName: CPU EP, Test on Android Emulator @@ -322,13 +323,14 @@ stages: --android_ndk_path $ANDROID_NDK_HOME \ --android_abi=x86_64 \ --android_api=29 \ + --android_run_emulator \ --build_java \ --use_nnapi \ --test displayName: NNAPI EP, Test, CodeCoverage on Android Emulator # used by Build Minimal ORT - - script: brew install coreutils ninja + - script: sudo apt install -y coreutils ninja-build displayName: Install coreutils and ninja - script: /bin/bash tools/ci_build/github/linux/ort_minimal/nnapi_minimal_build_minimal_ort_and_run_tests.sh $(pwd) @@ -369,7 +371,7 @@ stages: - template: "templates/use-android-ndk.yml" # used by Build Minimal ORT - - script: brew install coreutils ninja + - script: sudo apt install -y coreutils ninja-build displayName: Install coreutils and ninja - script: | From 3bd2080994e5f3669c6151f0c7c1cc7001dee768 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 26 Jun 2024 10:03:30 -0700 Subject: [PATCH 03/17] use-android-emulator.yml --- ...ndroid-x86_64-crosscompile-ci-pipeline.yml | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 8dbd50b9d892..f21f4702ee96 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -252,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 \ @@ -265,14 +265,13 @@ stages: --android_ndk_path $ANDROID_NDK_HOME \ --android_abi=x86_64 \ --android_api=30 \ - --android_run_emulator \ --build_java \ --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 @@ -315,6 +314,11 @@ 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 \ @@ -323,7 +327,6 @@ stages: --android_ndk_path $ANDROID_NDK_HOME \ --android_abi=x86_64 \ --android_api=29 \ - --android_run_emulator \ --build_java \ --use_nnapi \ --test @@ -337,6 +340,10 @@ 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 @@ -374,6 +381,11 @@ stages: - script: sudo apt install -y coreutils ninja-build displayName: Install coreutils and ninja + - template: templates/use-android-emulator.yml + parameters: + create: true + start: true + - script: | python3 tools/ci_build/build.py \ --android \ @@ -411,6 +423,10 @@ 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 From f71333924e88fa17523f42bd59db2ee7f29c0136 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 26 Jun 2024 10:04:35 -0700 Subject: [PATCH 04/17] reformat --- .../android-x86_64-crosscompile-ci-pipeline.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index f21f4702ee96..a281f62f0848 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -280,7 +280,6 @@ stages: # We need macOS-12 to run the Android emulator for now. # https://github.com/actions/runner-images/issues/7671 vmImage: 'ubuntu-latest' - timeoutInMinutes: 90 workspace: clean: all @@ -381,10 +380,10 @@ stages: - script: sudo apt install -y coreutils ninja-build displayName: Install coreutils and ninja - - 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 \ From 8008addad58f77710aa68a4d4a40385d7c21fb92 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 26 Jun 2024 10:05:13 -0700 Subject: [PATCH 05/17] reformat --- .../android-x86_64-crosscompile-ci-pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index a281f62f0848..fdf24c04b79d 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -381,9 +381,9 @@ stages: displayName: Install coreutils and ninja - template: templates/use-android-emulator.yml - parameters: - create: true - start: true + parameters: + create: true + start: true - script: | python3 tools/ci_build/build.py \ From 40635888dee986d45574cc55d711d582c1278602 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 26 Jun 2024 13:25:27 -0700 Subject: [PATCH 06/17] - script: | set -e -x \ uname -m \ echo "ANDROID_HOME=$ANDROID_HOME" \ echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ ls -R $ANDROID_SDK_ROOT displayName: Check Android NDKs --- ...ndroid-x86_64-crosscompile-ci-pipeline.yml | 33 +++++++++++++++++++ .../templates/use-android-emulator.yml | 1 + 2 files changed, 34 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index fdf24c04b79d..584d104cf3e8 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -79,6 +79,14 @@ stages: - template: "templates/use-android-ndk.yml" + - script: | + set -e -x \ + uname -m \ + echo "ANDROID_HOME=$ANDROID_HOME" \ + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ + ls -R $ANDROID_SDK_ROOT + displayName: Check Android NDKs + - script: | env | grep ANDROID displayName: View Android ENVs @@ -162,6 +170,16 @@ stages: displayName: Install coreutils and ninja - template: "templates/use-android-ndk.yml" + parameters: + + + - script: | + set -e -x \ + uname -m \ + echo "ANDROID_HOME=$ANDROID_HOME" \ + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ + ls -R $ANDROID_SDK_ROOT + displayName: Check Android NDKs - script: | env | grep ANDROID @@ -252,11 +270,26 @@ stages: - template: "templates/use-android-ndk.yml" + - script: | + set -e -x \ + uname -m \ + echo "ANDROID_HOME=$ANDROID_HOME" \ + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ + ls -R $ANDROID_SDK_ROOT + displayName: Check Android NDKs + - template: templates/use-android-emulator.yml parameters: create: true start: true + - script: | + set -e -x \ + uname -m \ + echo "ANDROID_HOME=$ANDROID_HOME" \ + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ + ls -R $ANDROID_SDK_ROOT + displayName: Check Android NDKs - script: | python3 tools/ci_build/build.py \ --android \ diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index b31882c8da18..058c80ce896b 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -17,6 +17,7 @@ steps: - ${{ if eq(parameters.create, true) }}: - script: | set -e -x + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" python3 tools/python/run_android_emulator.py \ --android-sdk-root $(ANDROID_SDK_ROOT) \ --create-avd --system-image "system-images;android-31;default;x86_64" From 9e750d87ac625f3701c193586050bc824c23f81f Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 28 Jun 2024 11:11:58 -0700 Subject: [PATCH 07/17] Check Android NDKs --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 584d104cf3e8..abd805c80460 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -85,7 +85,7 @@ stages: echo "ANDROID_HOME=$ANDROID_HOME" \ echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ ls -R $ANDROID_SDK_ROOT - displayName: Check Android NDKs + displayName: Check Android NDKs - script: | env | grep ANDROID @@ -179,7 +179,7 @@ stages: echo "ANDROID_HOME=$ANDROID_HOME" \ echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \ ls -R $ANDROID_SDK_ROOT - displayName: Check Android NDKs + displayName: Check Android NDKs - script: | env | grep ANDROID From b05116aa3cf409c7161c41ae17187ad6886bc587 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 28 Jun 2024 12:42:06 -0700 Subject: [PATCH 08/17] use-android-ndk.yml --- .../azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index abd805c80460..09eadb1d760a 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -170,8 +170,6 @@ stages: displayName: Install coreutils and ninja - template: "templates/use-android-ndk.yml" - parameters: - - script: | set -e -x \ From c66f9c52912cb19e05a8977cfb50151669da155a Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 28 Jun 2024 15:30:32 -0700 Subject: [PATCH 09/17] ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" --- .../github/azure-pipelines/templates/use-android-emulator.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index 058c80ce896b..96ef831edbe6 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -18,6 +18,7 @@ steps: - script: | set -e -x ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" python3 tools/python/run_android_emulator.py \ --android-sdk-root $(ANDROID_SDK_ROOT) \ --create-avd --system-image "system-images;android-31;default;x86_64" From 6ed88fde33515639cd32648216c8fc386f7b18e3 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 28 Jun 2024 16:25:19 -0700 Subject: [PATCH 10/17] onnxruntime-Ubuntu2204-AMD-CPU --- .../android-x86_64-crosscompile-ci-pipeline.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 09eadb1d760a..3212afac7de1 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -236,7 +236,7 @@ stages: pool: # We need macOS-12 to run the Android emulator for now. # https://github.com/actions/runner-images/issues/7671 - vmImage: 'ubuntu-latest' + vmImage: onnxruntime-Ubuntu2204-AMD-CPU workspace: clean: all condition: succeeded() @@ -308,9 +308,7 @@ stages: - 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: 'ubuntu-latest' + vmImage: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 90 workspace: clean: all @@ -385,9 +383,7 @@ stages: jobs: - job: NNAPI_EP_MASTER pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: 'ubuntu-latest' + vmImage: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 180 workspace: clean: all From a3f11b2d4451ce7b3a6a0f57eed77c4d447b5a5b Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 8 Jul 2024 13:58:24 -0400 Subject: [PATCH 11/17] onnxruntime-Ubuntu2204-AMD-CPU --- .../android-x86_64-crosscompile-ci-pipeline.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 3212afac7de1..cb8b44562f6f 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -233,10 +233,7 @@ stages: dependsOn: [BUILD_CPU_STAGE, BUILD_NNAPI_STAGE] jobs: - job: Test_CPU_EP - pool: - # We need macOS-12 to run the Android emulator for now. - # https://github.com/actions/runner-images/issues/7671 - vmImage: onnxruntime-Ubuntu2204-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU workspace: clean: all condition: succeeded() @@ -307,8 +304,7 @@ stages: - template: templates/clean-agent-build-directory-step.yml - job: Test_NNAPI_EP - pool: - vmImage: onnxruntime-Ubuntu2204-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 90 workspace: clean: all @@ -382,8 +378,7 @@ stages: condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') jobs: - job: NNAPI_EP_MASTER - pool: - vmImage: onnxruntime-Ubuntu2204-AMD-CPU + pool: onnxruntime-Ubuntu2204-AMD-CPU timeoutInMinutes: 180 workspace: clean: all From 094e39e689ce20390dfb8254900c453da167956a Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 8 Jul 2024 20:32:43 -0400 Subject: [PATCH 12/17] adb --- .../github/azure-pipelines/templates/use-android-emulator.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index 96ef831edbe6..eb756d432a75 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -19,6 +19,8 @@ steps: set -e -x ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list + sudo apt install -y adb python3 tools/python/run_android_emulator.py \ --android-sdk-root $(ANDROID_SDK_ROOT) \ --create-avd --system-image "system-images;android-31;default;x86_64" From a336be62845403ea8b983c7d5e58510bf27298ad Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 9 Jul 2024 19:20:49 -0400 Subject: [PATCH 13/17] run-with-android-emulator-steps.yml --- .../templates/use-android-emulator.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index eb756d432a75..9b7c521f8646 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -13,14 +13,24 @@ parameters: type: boolean default: false +- name: install_missing_packages + type: boolean + default: false + steps: -- ${{ if eq(parameters.create, true) }}: +- ${{ if eq(parameters.install_missing_packages, true) }}: - script: | set -e -x ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list sudo apt install -y adb + displayName: Download emulator platform tools and adb + condition: always() + +- ${{ if eq(parameters.create, true) }}: + - script: | + set -e -x python3 tools/python/run_android_emulator.py \ --android-sdk-root $(ANDROID_SDK_ROOT) \ --create-avd --system-image "system-images;android-31;default;x86_64" From c51efdc50aadfc1b7341767b00a94f59e2fb75e3 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 10 Jul 2024 10:10:22 -0400 Subject: [PATCH 14/17] run-with-android-emulator-steps.yml --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index cb8b44562f6f..b8dc454e4820 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -277,6 +277,8 @@ stages: parameters: create: true start: true + install_missing_packages: true + - script: | set -e -x \ @@ -342,6 +344,7 @@ stages: parameters: create: true start: true + install_missing_packages: true - script: | python3 tools/ci_build/build.py \ @@ -406,6 +409,7 @@ stages: parameters: create: true start: true + install_missing_packages: true - script: | python3 tools/ci_build/build.py \ From 139ce8be66e26816e90e8b7ec648d45703ef2c5c Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 10 Jul 2024 13:10:28 -0400 Subject: [PATCH 15/17] remove sudo apt install -y coreutils ninja-build --- .../android-x86_64-crosscompile-ci-pipeline.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index b8dc454e4820..a699a8ddb9e3 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -359,10 +359,6 @@ stages: --test displayName: NNAPI EP, Test, CodeCoverage on Android Emulator - # used by Build Minimal ORT - - script: sudo apt install -y coreutils ninja-build - displayName: Install coreutils and ninja - - script: /bin/bash tools/ci_build/github/linux/ort_minimal/nnapi_minimal_build_minimal_ort_and_run_tests.sh $(pwd) # Build Minimal ORT with NNAPI and reduced Ops, run unit tests on Android Emulator displayName: Build Minimal ORT with NNAPI and run tests @@ -401,10 +397,6 @@ stages: - template: "templates/use-android-ndk.yml" - # used by Build Minimal ORT - - script: sudo apt install -y coreutils ninja-build - displayName: Install coreutils and ninja - - template: templates/use-android-emulator.yml parameters: create: true From 931caefc8cec2632ab52d9b3bc5b3dda82e36d72 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 11 Jul 2024 14:07:20 -0400 Subject: [PATCH 16/17] try remove sudo apt install -y adb --- .../github/azure-pipelines/templates/use-android-emulator.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index 9b7c521f8646..82aa64b150a4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -24,7 +24,6 @@ steps: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list - sudo apt install -y adb displayName: Download emulator platform tools and adb condition: always() From df637924c88a8adeceff6295e1f8376ae6e1a953 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 11 Jul 2024 17:58:38 -0400 Subject: [PATCH 17/17] adding ${ANDROID_SDK_ROOT}/platform-tools to PATH --- .../github/azure-pipelines/templates/use-android-emulator.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml index 82aa64b150a4..d1a5908c6fa1 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml @@ -24,7 +24,9 @@ steps: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools" ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list - displayName: Download emulator platform tools and adb + ls -R ${ANDROID_SDK_ROOT}/platform-tools + echo "##vso[task.setvariable variable=PATH]$PATH:${ANDROID_SDK_ROOT}/platform-tools" + displayName: Download emulator platform tools condition: always() - ${{ if eq(parameters.create, true) }}: