Skip to content

[release/v7.5] Update machine pool for copy blob and upload buildinfo stage #24588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 1 commit into from
Nov 14, 2024
Merged

[release/v7.5] Update machine pool for copy blob and upload buildinfo stage #24588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pipelines/PowerShell-Release-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions .pipelines/templates/release-MakeBlobPublic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
9 changes: 7 additions & 2 deletions .pipelines/templates/release-upload-buildinfo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down