Fix Azure File Copy break in AzDevOps (#13173)

PowerShell · Jul 14, 2020 · 9d05561 · 9d05561
1 parent f90712a
commit 9d05561
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 24 deletions.
diff --git a/tools/releaseBuild/azureDevOps/WindowsBuild.yml b/tools/releaseBuild/azureDevOps/WindowsBuild.yml
@@ -247,7 +247,7 @@ jobs:
   dependsOn: BuildJob
   condition: succeeded()
   pool:
-    name: Package ES CodeHub Lab E
+    name: Package ES Standard Build
   strategy:
     matrix:
       release-anycpu:
@@ -332,7 +332,7 @@ jobs:
     continueOnError: true
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed msi to Azure - x64'
     inputs:
       SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-x64.msi'
@@ -352,7 +352,7 @@ jobs:
     displayName: '[create script] upload signed msi - x86'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed msi to Azure - x86'
     inputs:
       SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-$(Version)-win-x86.msi'
@@ -372,7 +372,7 @@ jobs:
     displayName: '[Create script] upload signed zip - x64'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed zip to Azure - x64'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x64.zip'
@@ -392,7 +392,7 @@ jobs:
     displayName: '[create script] upload signed zip - x86'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed zip to Azure - x86'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x86.zip'
@@ -412,7 +412,7 @@ jobs:
     displayName: '[create script] upload signed zip - arm'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed zip to Azure - arm'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm32.zip'
@@ -432,7 +432,7 @@ jobs:
     displayName: '[create script] upload signed zip - arm64'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed zip to Azure - arm64'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm64.zip'
@@ -452,7 +452,7 @@ jobs:
     displayName: '[create script] upload signed zip - fxdependent'
     continueOnError: true
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload signed zip to Azure - fxdependent'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-fxdependent.zip'

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -7,7 +7,7 @@ jobs:
   dependsOn:
     ${{ parameters.parentJobs }}
   pool:
-    name: Package ES CodeHub Lab E
+    name: Package ES Standard Build
 
   # APIScan can take a long time
   timeoutInMinutes: 180

diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -20,7 +20,7 @@ jobs:
       ReleaseTagVar: $(ReleaseTagVar)
       CreateJson: yes
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'upload daily-build-info JSON file to Azure - ${{ parameters.architecture }}'
     inputs:
       SourcePath: '$(BuildInfoPath)'

diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -49,7 +49,7 @@ jobs:
   displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
   dependsOn: build_${{ parameters.buildName }}
   condition: succeeded()
-  pool: Package ES CodeHub Lab E
+  pool: Package ES Standard Build
   variables:
     buildName: ${{ parameters.buildName }}
   steps:
@@ -109,7 +109,7 @@ jobs:
       binVersionOverride: $(SigningVersionOverride)
     condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'Upload to Azure - DEB and tar.gz'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\finished\release'
@@ -122,7 +122,7 @@ jobs:
     parameters:
       artifactPath: $(System.ArtifactsDirectory)\finished\release
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'Upload to Azure - RPM - Unsigned'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\rpm\release'
@@ -132,7 +132,7 @@ jobs:
       ContainerName: '$(AzureVersion)'
     condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'Upload to Azure - RPM - Signed'
     inputs:
       SourcePath: '$(Build.StagingDirectory)\signedPackages'

diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -4,7 +4,7 @@ jobs:
   dependsOn: build_macOS
   condition: succeeded()
   pool:
-    name: Package ES CodeHub Lab E
+    name: Package ES Standard Build
   variables:
     BuildConfiguration: release
     BuildPlatform: any cpu
@@ -97,7 +97,7 @@ jobs:
     displayName: 'Create unsigned folder to upload'
     condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'AzureBlob File Copy - unsigned'
     inputs:
       SourcePath: '$(Build.StagingDirectory)\macos-unsigned'
@@ -107,7 +107,7 @@ jobs:
       ContainerName: '$(AzureVersion)'
     condition: and(succeeded(), ne(variables['SHOULD_SIGN'], 'true'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'AzureBlob File Copy - signed'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\azureMacOs'

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -160,7 +160,7 @@ jobs:
       Get-ChildItem "$(System.ArtifactsDirectory)\signed\globaltool" -Recurse
     displayName: Move global tool packages to subfolder and capture
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'Upload NuGet packages to Azure'
     inputs:
       SourcePath: '$(System.ArtifactsDirectory)\signed\'
@@ -170,7 +170,7 @@ jobs:
       ContainerName: '$(AzureVersion)-nuget'
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
-  - task: AzureFileCopy@3
+  - task: AzureFileCopy@4
     displayName: 'Upload global tool packages to Azure'
     inputs:
       sourcePath: '$(System.ArtifactsDirectory)\signed\globaltool'

diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml
@@ -12,33 +12,35 @@ steps:
     artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi
     condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
 
-- task: AzureFileCopy@3
+- task: AzureFileCopy@4
   displayName: 'upload signed msi to Azure - ${{ parameters.architecture }}'
   inputs:
     SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msi'
     azureSubscription: '$(AzureFileCopySubscription)'
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: '$(AzureVersion)'
+    resourceGroup: '$(StorageResourceGroup)'
   condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes'))
 
 - template: upload-final-results.yml
   parameters:
     artifactPath: $(System.ArtifactsDirectory)\signed
     artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip
 
-- task: AzureFileCopy@3
+- task: AzureFileCopy@4
   displayName: 'upload signed zip to Azure - ${{ parameters.architecture }}'
   inputs:
     SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
     azureSubscription: '$(AzureFileCopySubscription)'
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: '$(AzureVersion)'
+    resourceGroup: '$(StorageResourceGroup)'
   condition: succeeded()
 
 # Disable upload task as the symbols package is not currently used and we want to avoid publishing this in releases
-#- task: AzureFileCopy@3
+#- task: AzureFileCopy@4
 #  displayName: 'upload pbd zip to Azure - ${{ parameters.architecture }}'
 #  inputs:
 #    SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-Symbols-${{ parameters.version }}-win-${{ parameters.architecture }}.zip'
@@ -54,12 +56,13 @@ steps:
     artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix
     condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'))
 
-- task: AzureFileCopy@3
+- task: AzureFileCopy@4
   displayName: 'upload signed msix to Azure - ${{ parameters.architecture }}'
   inputs:
     SourcePath: '$(Build.StagingDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.msix'
     azureSubscription: '$(AzureFileCopySubscription)'
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: '$(AzureVersion)-private'
+    resourceGroup: '$(StorageResourceGroup)'
   condition: and(succeeded(), eq('${{ parameters.msix }}', 'yes'), eq(variables['SHOULD_SIGN'], 'true'))
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -8,7 +8,7 @@ jobs:
     ${{ parameters.parentJobs }}
   condition: succeeded()
   pool:
-    name: Package ES CodeHub Lab E
+    name: Package ES Standard Build
   variables:
     BuildConfiguration: release
     BuildPlatform: any cpu