From 2800f895f59272e97583fddec9285cd773142f5b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 14 Nov 2024 14:14:58 -0800
Subject: [PATCH] Update machine pool for copy blob and upload buildinfo stage
 (#24587) (#24588)

---
 .pipelines/PowerShell-Release-Official.yml        | 6 +++---
 .pipelines/templates/release-MakeBlobPublic.yml   | 9 +++++++++
 .pipelines/templates/release-upload-buildinfo.yml | 9 +++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.pipelines/PowerShell-Release-Official.yml b/.pipelines/PowerShell-Release-Official.yml
index 2538d1b5370..195491ef161 100644
--- a/.pipelines/PowerShell-Release-Official.yml
+++ b/.pipelines/PowerShell-Release-Official.yml
@@ -79,12 +79,12 @@ resources:
 extends:
   template: v2/OneBranch.Official.CrossPlat.yml@templates
   parameters:
-    # still using KS2 because we are not yet using a Box Product Deployment
+    # using Monitor as copy blob is being blocked by the network
     featureFlags:
       LinuxHostVersion:
-          Network: KS2
+          Network: Monitor
       WindowsHostVersion:
-          Network: KS2
+          Network: Monitor
     cloudvault:
       enabled: false
     globalSdl:
diff --git a/.pipelines/templates/release-MakeBlobPublic.yml b/.pipelines/templates/release-MakeBlobPublic.yml
index f9afbebb909..84a02c9e0f0 100644
--- a/.pipelines/templates/release-MakeBlobPublic.yml
+++ b/.pipelines/templates/release-MakeBlobPublic.yml
@@ -17,7 +17,12 @@ jobs:
   dependsOn: CopyReleaseBlobApproval
   condition: and(succeeded(), ne('${{ parameters.SkipPSInfraInstallers }}', true))
   pool:
+    name: PowerShell1ES
     type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+
 
   variables:
   - group: 'PSInfraStorage'
@@ -113,7 +118,11 @@ jobs:
   displayName: Copy global tools to PSInfra storage
   dependsOn: CopyBlobApproval
   pool:
+    name: PowerShell1ES
     type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
 
   variables:
     - group: 'PSInfraStorage'
diff --git a/.pipelines/templates/release-upload-buildinfo.yml b/.pipelines/templates/release-upload-buildinfo.yml
index f2b06cd2010..ea7b90db8e3 100644
--- a/.pipelines/templates/release-upload-buildinfo.yml
+++ b/.pipelines/templates/release-upload-buildinfo.yml
@@ -8,7 +8,11 @@ jobs:
   displayName: Publish BuildInfo
   condition: succeeded()
   pool:
+    name: PowerShell1ES
     type: windows
+    isCustom: true
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
   - name: runCodesignValidationInjection
     value: false
@@ -45,14 +49,15 @@ jobs:
     displayName: Download build info artifact
 
   - pwsh: |
-      Import-Module '$(Build.SourcesDirectory)/PowerShell/tools/ci.psm1'
+      $toolsDirectory = '$(Build.SourcesDirectory)/tools'
+      Import-Module "$toolsDirectory/ci.psm1"
       $jsonFile = Get-Item "$ENV:PIPELINE_WORKSPACE/PSPackagesOfficial/BuildInfoJson/*.json"
       $fileName = Split-Path $jsonFile -Leaf
 
       $dateTime = [datetime]::UtcNow
       $dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
 
-      $metadata = Get-Content -LiteralPath '$(Build.SourcesDirectory)/PowerShell/tools/metadata.json' -ErrorAction Stop | ConvertFrom-Json
+      $metadata = Get-Content -LiteralPath "$toolsDirectory/metadata.json" -ErrorAction Stop | ConvertFrom-Json
       $stableRelease = $metadata.StableRelease.Latest
       $ltsRelease = $metadata.LTSRelease.Latest