Merge pull request #7097 from dibarbet/fix_pipelines

Cherry-pick pipelines fix to release
dotnet · May 6, 2024 · 95c46ea · 95c46ea
2 parents 37a1abd + dff2827
commit 95c46ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -31,7 +31,7 @@ extends:
   parameters:
     pool:
       name: netcore1espool-internal
-      image: 1es-windows-2022-pt
+      image: 1es-windows-2022
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling

diff --git a/azure-pipelines/build-all.yml b/azure-pipelines/build-all.yml
@@ -20,7 +20,7 @@ stages:
     pool:
       ${{ if eq(parameters.isOfficial, true) }}:
         name: netcore1espool-internal
-        image: 1es-ubuntu-2204-pt
+        image: 1es-ubuntu-2204
       ${{ else }}:
         name: Azure Pipelines
         vmImage: ubuntu-latest
@@ -63,7 +63,7 @@ stages:
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
-          image: 1es-ubuntu-2204-pt
+          image: 1es-ubuntu-2204
         ${{ else }}:
           name: Azure Pipelines
           vmImage: ubuntu-latest
@@ -76,7 +76,7 @@ stages:
       pool:
         ${{ if eq(parameters.isOfficial, true) }}:
           name: netcore1espool-internal
-          image: 1es-windows-2022-pt
+          image: 1es-windows-2022
         ${{ else }}:
           name: Azure Pipelines
           vmImage: windows-latest

diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml
@@ -36,7 +36,7 @@ extends:
   parameters:
     pool:
       name: netcore1espool-internal
-      image: 1es-windows-2022-pt
+      image: 1es-windows-2022
       os: windows
     stages:
     - stage: LocalizationStage

diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
@@ -27,7 +27,7 @@ extends:
   parameters:
     pool:
       name: netcore1espool-internal
-      image: 1es-windows-2022-pt
+      image: 1es-windows-2022
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
@@ -39,7 +39,7 @@ extends:
         environment: vscode-csharp-release-approvals
         pool:
           name: netcore1espool-internal
-          image: 1es-ubuntu-2204-pt
+          image: 1es-ubuntu-2204
           os: linux
         strategy:
           runOnce:
@@ -116,7 +116,7 @@ extends:
       - job: 'Tag'
         pool:
           name: netcore1espool-internal
-          image: 1es-ubuntu-2204-pt
+          image: 1es-ubuntu-2204
           os: linux
         steps:
         - task: NodeTool@0