From 40efbd6c37a735d963d56237ea98b96c3198b5ab Mon Sep 17 00:00:00 2001 From: Baiju Meswani Date: Tue, 26 Mar 2024 12:20:11 -0700 Subject: [PATCH] Fix training and macos ci pipelines (#20034) --- .github/workflows/publish-objectivec-apidocs.yml | 2 +- .../mac-objc-static-analysis-ci-pipeline.yml | 2 +- .../azure-pipelines/nodejs/templates/test_macos.yml | 2 +- .../github/azure-pipelines/nuget/templates/test_macos.yml | 2 +- tools/ci_build/github/azure-pipelines/post-merge-jobs.yml | 8 ++++---- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- .../github/azure-pipelines/templates/c-api-cpu.yml | 8 ++++---- .../azure-pipelines/templates/py-packaging-stage.yml | 4 +++- .../templates/py-packaging-training-cuda-stage-steps.yml | 1 + .../azure-pipelines/templates/use-xcode-version.yml | 2 +- 10 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish-objectivec-apidocs.yml b/.github/workflows/publish-objectivec-apidocs.yml index b9f3c0b9a3..ebacd38f1f 100644 --- a/.github/workflows/publish-objectivec-apidocs.yml +++ b/.github/workflows/publish-objectivec-apidocs.yml @@ -21,7 +21,7 @@ permissions: jobs: build: name: Generate Objective-C API docs - runs-on: macos-13 + runs-on: macos-latest steps: - uses: actions/checkout@v4 diff --git a/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml index 7e8e72cad1..4927c9684b 100644 --- a/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-objc-static-analysis-ci-pipeline.yml @@ -2,7 +2,7 @@ jobs: - job: ObjCStaticAnalysis pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' timeoutInMinutes: 30 diff --git a/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml index dc52e9a22f..f66c7d9938 100644 --- a/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml +++ b/tools/ci_build/github/azure-pipelines/nodejs/templates/test_macos.yml @@ -11,7 +11,7 @@ stages: clean: all timeoutInMinutes: 120 pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' variables: - name: OnnxRuntimeBuildDirectory diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml index de0520b975..4dcec0f8cf 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml @@ -11,7 +11,7 @@ stages: workspace: clean: all pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' variables: - name: OnnxRuntimeBuildDirectory diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index bb4402faeb..82708bbec3 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -405,7 +405,7 @@ stages: - job: IosDynamicFramework timeoutInMinutes: 120 pool: - vmImage: "macOS-13" + vmImage: "macOS-latest" steps: - task: UsePythonVersion@0 @@ -416,7 +416,7 @@ stages: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.2 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt @@ -442,7 +442,7 @@ stages: - job: IosMinimalTrainingBuild timeoutInMinutes: 120 pool: - vmImage: "macOS-13" + vmImage: "macOS-latest" steps: - task: UsePythonVersion@0 @@ -453,7 +453,7 @@ stages: - template: templates/use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.2 - script: | pip install -r tools/ci_build/github/apple/ios_packaging.requirements.txt 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 04f555deb1..acec6f501e 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 @@ -43,7 +43,7 @@ stages: parameters: job_name: Test_MAC_Wheels machine_pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' itemPattern: '*/*mac*x86_64.whl' - template: templates/py-package-smoking-test.yml parameters: 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 0bb9fad671..44f7c1829a 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 @@ -101,14 +101,14 @@ stages: workspace: clean: all pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' timeoutInMinutes: 300 steps: - template: set-version-number-variables-step.yml - template: use-xcode-version.yml parameters: - xcodeVersion: 14.3 + xcodeVersion: 14.2 - script: | /bin/bash $(Build.SourcesDirectory)/tools/ci_build/github/apple/build_host_protoc.sh \ $(Build.SourcesDirectory) \ @@ -796,7 +796,7 @@ stages: - template: ../nuget/templates/test_macos.yml parameters: - AgentPool : macOS-13 + AgentPool : macOS-latest ArtifactSuffix: 'CPU' - template: ../nodejs/templates/test_win.yml @@ -832,4 +832,4 @@ stages: OS: MacOS BuildId: ${{ parameters.BuildId }} SpecificArtifact: ${{ parameters.SpecificArtifact }} - PoolName: 'macOS-13' + PoolName: 'macOS-latest' 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 5ac5bda8b0..2e5aee7760 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 @@ -362,7 +362,7 @@ stages: workspace: clean: all pool: - vmImage: 'macOS-13' + vmImage: 'macOS-latest' variables: MACOSX_DEPLOYMENT_TARGET: '11.0' strategy: @@ -388,6 +388,8 @@ stages: versionSpec: $(PythonVersion) - template: use-xcode-version.yml + parameters: + xcodeVersion: 14.2 - script: | set -e -x diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage-steps.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage-steps.yml index 024b9b4559..004c44d5f6 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage-steps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage-steps.yml @@ -36,6 +36,7 @@ stages: jobs: - job: Build pool: onnxruntime-Ubuntu2204-AMD-CPU + timeoutInMinutes: 180 steps: - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3 displayName: 'Clean Agent Directories' diff --git a/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml b/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml index 5742b6c60f..ec4398fe31 100644 --- a/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml +++ b/tools/ci_build/github/azure-pipelines/templates/use-xcode-version.yml @@ -3,7 +3,7 @@ parameters: - name: xcodeVersion type: string - default: "15.1" + default: "14.2" steps: - bash: |