8000 Update machine pool for copy blob and upload buildinfo stage (#24587)… · PowerShell/PowerShell@2800f89 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2800f89

Browse files
adityapatwardhanadityapatwardhan
authored
Update machine pool for copy blob and upload buildinfo stage (#24587) (#24588)
1 parent be6dfe3 commit 2800f89

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

‎.pipelines/PowerShell-Release-Official.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ resources:
7979
extends:
8080
template: v2/OneBranch.Official.CrossPlat.yml@templates
8181
parameters:
82-
# still using KS2 because we are not yet using a Box Product Deployment
82+
# using Monitor as copy blob is being blocked by the network
8383
featureFlags:
8484
LinuxHostVersion:
85-
Network: KS2
85+
Network: Monitor
8686
WindowsHostVersion:
87-
Network: KS2
87+
Network: Monitor
8888
cloudvault:
8989
enabled: false
9090
globalSdl:

‎.pipelines/templates/release-MakeBlobPublic.yml

+9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ jobs:
1717
dependsOn: CopyReleaseBlobApproval
1818
condition: and(succeeded(), ne('${{ parameters.SkipPSInfraInstallers }}', true))
1919
pool:
20+
name: PowerShell1ES
2021
type: windows
22+
isCustom: true
23+
demands:
24+
- ImageOverride -equals PSMMS2019-Secure
25+
2126

2227
variables:
2328
- group: 'PSInfraStorage'
@@ -113,7 +118,11 @@ jobs:
113118
displayName: Copy global tools to PSInfra storage
114119
dependsOn: CopyBlobApproval
115120
pool:
121+
name: PowerShell1ES
116122
type: windows
123+
isCustom: true
124+
demands:
125+
- ImageOverride -equals PSMMS2019-Secure
117126

118127
variables:
119128
- group: 'PSInfraStorage'

‎.pipelines/templates/release-upload-buildinfo.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ jobs:
88
displayName: Publish BuildInfo
99
condition: succeeded()
1010
pool:
11+
name: PowerShell1ES
1112
type: windows
13+
isCustom: true
14+
demands:
15+
- ImageOverride -equals PSMMS2019-Secure
1216
variables:
1317
- name: runCodesignValidationInjection
1418
value: false
@@ -45,14 +49,15 @@ jobs:
4549
displayName: Download build info artifact
4650

4751
- pwsh: |
48-
Import-Module '$(Build.SourcesDirectory)/PowerShell/tools/ci.psm1'
52+
$toolsDirectory = '$(Build.SourcesDirectory)/tools'
53+
Import-Module "$toolsDirectory/ci.psm1"
4954
$jsonFile = Get-Item "$ENV:PIPELINE_WORKSPACE/PSPackagesOfficial/BuildInfoJson/*.json"
5055
$fileName = Split-Path $jsonFile -Leaf
5156
5257
$dateTime = [datetime]::UtcNow
5358
$dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
5459
55-
$metadata = Get-Content -LiteralPath '$(Build.SourcesDirectory)/PowerShell/tools/metadata.json' -ErrorAction Stop | ConvertFrom-Json
60+
$metadata = Get-Content -LiteralPath "$toolsDirectory/metadata.json" -ErrorAction Stop | ConvertFrom-Json
5661
$stableRelease = $metadata.StableRelease.Latest
5762
$ltsRelease = $metadata.LTSRelease.Latest
5863

0 commit comments

Comments
 (0)
0