Merge commit '5bf41dc1cc7b148fb793088ddc648f9a455423c3'

dotnet · Oct 4, 2024 · 8b6c7d8 · 8b6c7d8
2 parents e782819 + 5bf41dc
commit 8b6c7d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/eng/pipelines/stages/preparerelease.yml b/eng/pipelines/stages/preparerelease.yml
@@ -49,39 +49,16 @@ stages:
             -BarId $(BARBuildId)
             -TaskVariableName 'BuildVersion'
 
-      # Populate dotnetbuilds-internal-container-read-token
-      - template: /eng/common/templates-official/steps/get-delegation-sas.yml
-        parameters:
-          federatedServiceConnection: 'dotnetbuilds-internal-read'
-          outputVariableName: 'dotnetbuilds-internal-checksums-container-read-token'
-          expiryInHours: 1
-          base64Encode: false
-          storageAccount: dotnetbuilds
-          container: internal-checksums
-          permissions: rl
-
-      # Populate dotnetbuilds-internal-container-read-token
-      - template: /eng/common/templates-official/steps/get-delegation-sas.yml
-        parameters:
-          federatedServiceConnection: 'dotnetbuilds-internal-read'
-          outputVariableName: 'dotnetbuilds-internal-container-read-token'
-          expiryInHours: 1
-          base64Encode: false
-          storageAccount: dotnetbuilds
-          container: internal
-          permissions: rl
-
       - task: AzureCLI@2
         displayName: 'Download Build Assets'
         inputs:
-          azureSubscription: 'Darc: Maestro Production'
+          azureSubscription: 'DotNetStaging'
           scriptType: ps
           scriptPath: '$(Build.Repository.LocalPath)/eng/release/Scripts/AcquireBuild.ps1'
           arguments: >-
             -BarBuildId "$(BARBuildId)"
             -AzdoToken "$(dn-bot-all-drop-rw-code-rw-release-all)"
             -DownloadTargetPath "$(System.ArtifactsDirectory)\BuildAssets"
-            -SasSuffixes "$(dotnetbuilds-internal-checksums-container-read-token),$(dotnetbuilds-internal-container-read-token)"
             -ReleaseVersion "$(Build.BuildNumber)"
           workingDirectory: '$(Build.Repository.LocalPath)'
         continueOnError: true

diff --git a/eng/release/Scripts/AcquireBuild.ps1 b/eng/release/Scripts/AcquireBuild.ps1
@@ -2,7 +2,6 @@ param(
   [Parameter(Mandatory=$true)][int] $BarBuildId,
   [Parameter(Mandatory=$true)][string] $ReleaseVersion,
   [Parameter(Mandatory=$true)][string] $DownloadTargetPath,
-  [Parameter(Mandatory=$true)][string] $SasSuffixes,
   [Parameter(Mandatory=$true)][string] $AzdoToken,
   [Parameter(Mandatory=$false)][string] $DarcVersion = $null,
   [Parameter(Mandatory=$false)][bool] $Separated = $true,
@@ -14,7 +13,6 @@ function Write-Help() {
     Write-Host "  -BarBuildId <value>               BAR Build ID of the diagnostics build to publish."
     Write-Host "  -ReleaseVersion <value>           Name to give the diagnostics release."
     Write-Host "  -DownloadTargetPath <value>       Path to download the build to."
-    Write-Host "  -SasSuffixes <value>              Comma separated list of potential uri suffixes that can be used if anonymous access to a blob uri fails. Appended directly to the end of the URI. Use full SAS syntax with ?."
     Write-Host "  -AzdoToken <value>                Azure DevOps token to use for builds queries"
     Write-Host "  -Separated <`$true|`$false>       Download files to their repo separated locations."
     Write-Host ""
@@ -55,11 +53,12 @@ try {
         --release-name $ReleaseVersion `
         --output-dir $DownloadTargetPath `
         --overwrite `
-        --sas-suffixes $SasSuffixes `
+        --use-azure-credential-for-blobs `
         --azdev-pat $AzdoToken `
         --verbose `
         --continue-on-error `
         --ci `
+        --verbose `
         $separatedArgs
 
     if ($LastExitCode -ne 0) {