From 701e73b5b80fb3fac62d9ce216b0ac4abc063be5 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Thu, 18 Mar 2021 12:09:12 -0700 Subject: [PATCH] Move Linux minimal build CI pipeline to the new Linux machine pool (#7050) --- .../azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml | 4 +++- .../build_minimal_ort_android_baseline_and_report_bin_size.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml index 015602a561..0f39630b76 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml @@ -18,7 +18,7 @@ jobs: timeoutInMinutes: 120 workspace: clean: all - pool: Linux-CPU + pool: Linux-CPU-2019 variables: test_data_directory: $(Build.SourcesDirectory)/.test_data @@ -157,10 +157,12 @@ jobs: displayName: Build onnxruntime minimal baseline for Android arm64-v8a and report binary size inputs: script: | + NDK_HOME=$(realpath $ANDROID_NDK_HOME) docker run --rm \ --volume $(Build.SourcesDirectory):/onnxruntime_src \ --volume $(Build.BinariesDirectory):/build \ --volume $ANDROID_HOME:/android_home \ + --volume $NDK_HOME:/ndk_home \ --volume $(test_data_directory):/home/onnxruntimedev/.test_data \ -e ALLOW_RELEASED_ONNX_OPSET_ONLY=1 \ -e NIGHTLY_BUILD \ diff --git a/tools/ci_build/github/linux/ort_minimal/build_minimal_ort_android_baseline_and_report_bin_size.sh b/tools/ci_build/github/linux/ort_minimal/build_minimal_ort_android_baseline_and_report_bin_size.sh index a7d7c2fea2..f6daf5ec04 100644 --- a/tools/ci_build/github/linux/ort_minimal/build_minimal_ort_android_baseline_and_report_bin_size.sh +++ b/tools/ci_build/github/linux/ort_minimal/build_minimal_ort_android_baseline_and_report_bin_size.sh @@ -18,7 +18,7 @@ python3 /onnxruntime_src/tools/ci_build/build.py \ --parallel \ --android \ --android_sdk_path /android_home \ - --android_ndk_path /android_home/ndk-bundle \ + --android_ndk_path /ndk_home \ --android_abi=arm64-v8a \ --android_api=29 \ --minimal_build \