Update machine pool for copy blob and upload buildinfo stage (#24587)

This commit is contained in:
Aditya Patwardhan 2024-11-14 14:08:14 -08:00 committed by GitHub
parent c2f1ff00ae
commit 435bd05d16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 5 deletions

View File

@ -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:

View File

@ -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'

View File

@ -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