From deac2c556d7f78da6bb9705cf66676cf362b5d4f Mon Sep 17 00:00:00 2001 From: Adam Hammer Date: Wed, 29 Jan 2025 10:22:20 -0800 Subject: [PATCH 1/5] update pool/templates --- eng/pipelines/ci.yml | 4 ++-- eng/pipelines/jobs/CI-build-job.yml | 2 +- eng/pipelines/jobs/UI-test-job.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 5a337bb25..12b470d85 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -21,11 +21,11 @@ parameters: - name: pools type: object default: - - name: vsts-mac-142-xcode-152 + - name: vsts-mac-152-xcode-162 os: macos extends: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: pool: os: windows diff --git a/eng/pipelines/jobs/CI-build-job.yml b/eng/pipelines/jobs/CI-build-job.yml index fd10797fb..734bd0e95 100644 --- a/eng/pipelines/jobs/CI-build-job.yml +++ b/eng/pipelines/jobs/CI-build-job.yml @@ -5,7 +5,7 @@ jobs: displayName: "Build UI Library (Debug) for CI" pool: os: macos - name: vsts-mac-142-xcode-152 + name: vsts-mac-152-xcode-162 demands: xcode steps: - task: servicetree-link-build-task@1 diff --git a/eng/pipelines/jobs/UI-test-job.yml b/eng/pipelines/jobs/UI-test-job.yml index 065eb91cf..0d98391b6 100644 --- a/eng/pipelines/jobs/UI-test-job.yml +++ b/eng/pipelines/jobs/UI-test-job.yml @@ -4,7 +4,7 @@ jobs: - job: CallingAutomatedUITest displayName: "Calling Automated UI Tests" pool: - name: vsts-mac-131-xcode-142 + name: vsts-mac-152-xcode-162 demands: xcode variables: From f415b76aa04036fbcf74716a96c1b75df38e749d Mon Sep 17 00:00:00 2001 From: Adam Hammer Date: Wed, 29 Jan 2025 10:35:54 -0800 Subject: [PATCH 2/5] update more pipelines --- eng/pipelines/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/release.yml b/eng/pipelines/release.yml index 85f92866c..98bf1cf55 100644 --- a/eng/pipelines/release.yml +++ b/eng/pipelines/release.yml @@ -23,10 +23,10 @@ parameters: - name: pools type: object default: - - name: vsts-mac-131-xcode-142 + - name: vsts-mac-152-xcode-162 os: macos extends: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: pool: os: windows @@ -46,7 +46,7 @@ extends: targetPath: $(build.artifactstagingdirectory) pool: os: macos - name: vsts-mac-131-xcode-142 + name: vsts-mac-152-xcode-162 steps: - checkout: self clean: true From acb516b23fd44e82d68636e6f7dbacd78d48baf5 Mon Sep 17 00:00:00 2001 From: Adam Hammer Date: Wed, 29 Jan 2025 10:40:57 -0800 Subject: [PATCH 3/5] update to latest mac pool --- eng/pipelines/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/release.yml b/eng/pipelines/release.yml index 98bf1cf55..e2ea868b4 100644 --- a/eng/pipelines/release.yml +++ b/eng/pipelines/release.yml @@ -23,7 +23,7 @@ parameters: - name: pools type: object default: - - name: vsts-mac-152-xcode-162 + - name: vsts-mac-146-xcode-160 os: macos extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines @@ -46,7 +46,7 @@ extends: targetPath: $(build.artifactstagingdirectory) pool: os: macos - name: vsts-mac-152-xcode-162 + name: vsts-mac-146-xcode-160 steps: - checkout: self clean: true From 3bc5662031278fdb89d02d157b99090abde600ad Mon Sep 17 00:00:00 2001 From: Adam Hammer Date: Wed, 29 Jan 2025 10:42:04 -0800 Subject: [PATCH 4/5] update pipeline spec --- eng/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 12b470d85..9f62a23c0 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -21,7 +21,7 @@ parameters: - name: pools type: object default: - - name: vsts-mac-152-xcode-162 + - name: vsts-mac-146-xcode-160 os: macos extends: From c1995ff32541ec3e707c0d11b605f2384e240e85 Mon Sep 17 00:00:00 2001 From: Adam Hammer Date: Wed, 29 Jan 2025 10:43:05 -0800 Subject: [PATCH 5/5] add jobs --- eng/pipelines/jobs/CI-build-job.yml | 2 +- eng/pipelines/jobs/UI-test-job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/jobs/CI-build-job.yml b/eng/pipelines/jobs/CI-build-job.yml index 734bd0e95..b22ef6fdd 100644 --- a/eng/pipelines/jobs/CI-build-job.yml +++ b/eng/pipelines/jobs/CI-build-job.yml @@ -5,7 +5,7 @@ jobs: displayName: "Build UI Library (Debug) for CI" pool: os: macos - name: vsts-mac-152-xcode-162 + name: vsts-mac-146-xcode-160 demands: xcode steps: - task: servicetree-link-build-task@1 diff --git a/eng/pipelines/jobs/UI-test-job.yml b/eng/pipelines/jobs/UI-test-job.yml index 0d98391b6..929b048a4 100644 --- a/eng/pipelines/jobs/UI-test-job.yml +++ b/eng/pipelines/jobs/UI-test-job.yml @@ -4,7 +4,7 @@ jobs: - job: CallingAutomatedUITest displayName: "Calling Automated UI Tests" pool: - name: vsts-mac-152-xcode-162 + name: vsts-mac-146-xcode-160 demands: xcode variables: