From 5ca08fcd08d58d67c12890291d5c85fe4238f2d8 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Tue, 31 Oct 2023 17:09:02 -0700 Subject: [PATCH 1/2] Merge aiinfra-linux-ARM64-CPU-2019 and onnxruntime-linux-ARM64-CPU-2019 --- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- .../azure-pipelines/templates/linux-cpu-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/templates/py-packaging-stage.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml index 2db68d3bf1952..5e0193662673f 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml @@ -30,7 +30,7 @@ stages: - template: templates/py-packaging-linux-test-cpu.yml parameters: arch: 'aarch64' - machine_pool: 'aiinfra-linux-ARM64-CPU-2019' + machine_pool: 'onnxruntime-linux-ARM64-CPU-2019' base_image: 'arm64v8/centos:7' devtoolset_rootpath: /opt/rh/devtoolset-10/root ld_library_path_arg: /opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/usr/local/lib64 diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml index a2ad934f7f85c..b6c23fdbb4957 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-cpu-packaging-pipeline.yml @@ -47,7 +47,7 @@ stages: OnnxruntimeCFlags: '-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -O3 -Wl,--strip-all' OnnxruntimeCXXFlags: '-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection -O3 -Wl,--strip-all' OnnxruntimeNodejsBindingArch: 'arm64' - PoolName: 'aiinfra-linux-ARM64-CPU-2019' + PoolName: 'onnxruntime-linux-ARM64-CPU-2019' ArtifactNamePrefix: ${{ parameters.ArtifactNamePrefix }} PackageJava: ${{ parameters.PackageJava }} PackageNodeJS: ${{ parameters.PackageNodeJS }} diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index a872228f5d1e7..de4896c1080e6 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -484,7 +484,7 @@ stages: - template: py-linux.yml parameters: arch: 'aarch64' - machine_pool: 'aiinfra-linux-ARM64-CPU-2019' + machine_pool: 'onnxruntime-linux-ARM64-CPU-2019' base_image: 'arm64v8/centos:7' devtoolset_rootpath: /opt/rh/devtoolset-10/root ld_library_path_arg: /opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/usr/local/lib64 From d7c9df31448954bf9d1c9fffcf9471713347a0ba Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Tue, 17 Oct 2023 09:30:14 -0700 Subject: [PATCH 2/2] Move a nodejs test to a different machine pool (#17970) ### Description This is a temp fix for the failing "Zip-Nuget-Java-Nodejs Packaging Pipeline". The pipeline is failing because I removed NodeJS from the build machine pool's image, to reduce the number of dependencies we need to maintain in VMs. So this PR will temporarily move the test to a different machine pool to get the test passed. Then I will move the test to docker. Docker images are relatively easier to update and maintain. Now we almost run all Linux test in docker, except for this one. Moving it to docker is needed for enabling GPU support in nodejs, because all our Linux VMs do not have CUDA. ### Motivation and Context --- .../github/azure-pipelines/nodejs/templates/test_linux.yml | 4 ++-- tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/nodejs/templates/test_linux.yml b/tools/ci_build/github/azure-pipelines/nodejs/templates/test_linux.yml index 4563a79adb834..864d1002a90fc 100644 --- a/tools/ci_build/github/azure-pipelines/nodejs/templates/test_linux.yml +++ b/tools/ci_build/github/azure-pipelines/nodejs/templates/test_linux.yml @@ -1,5 +1,5 @@ parameters: - AgentPool: 'onnxruntime-Ubuntu2004-AMD-CPU' + AgentPool: 'Azure-Pipelines-EO-Ubuntu-2004-aiinfra' StageSuffix: '' stages: - stage: Nodejs_Test_${{ parameters.StageSuffix }} @@ -18,4 +18,4 @@ stages: value: '$(Build.BinariesDirectory)' steps: - template: test.yml - \ No newline at end of file + diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 21cd3a44e8924..af245c99700ec 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -804,7 +804,7 @@ stages: - template: ../nodejs/templates/test_linux.yml parameters: - AgentPool : 'onnxruntime-Ubuntu2004-AMD-CPU' + AgentPool : 'Azure-Pipelines-EO-Ubuntu-2004-aiinfra' StageSuffix : 'Linux_CPU_x64' - template: ../nodejs/templates/test_macos.yml