Switch to our custom images for build and release (PowerShell#16801)

TravisEz13 · TravisEz13 · commit 3b49c7aa61b0 · 2022-03-08T11:36:26.000-08:00
# Conflicts:
#	tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
diff --git a/build.psm1 b/build.psm1
@@ -1830,7 +1830,7 @@ function Start-PSBootstrap {
                 elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
+                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm" }
 
                 # Install dependencies
                 # change the fontend from apt-get to noninteractive
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -946,7 +946,15 @@ function New-UnixPackage {
         try {
             if ($PSCmdlet.ShouldProcess("Create $type package")) {
                 Write-Log "Creating package with fpm..."
-                $Output = Start-NativeExecution { fpm $Arguments }
+                try {
+                    $Output = Start-NativeExecution { fpm $Arguments }
+                }
+                catch {
+                    Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue
+                    Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
+                    Get-Error -InputObject $_
+                    throw
+                }
             }
         } finally {
             if ($Environment.IsMacOS) {
@@ -3947,7 +3955,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
         }
     }
     catch {
-        Get-Error
+        Get-Error -InputObject $_
         throw
     }
 }
@@ -4032,7 +4040,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
         }
     }
     catch {
-        Get-Error
+        Get-Error -InputObject $_
         throw
     }
 }
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -177,7 +177,7 @@ stages:
         pool:
           name: PowerShell1ES
           demands:
-          - ImageOverride -equals MMS2019TLS
+          - ImageOverride -equals PSMMS2019-Secure
         steps:
         - checkout: self
           clean: true
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -145,7 +145,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Staging_ACR'
@@ -161,7 +161,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Azure Blob variable group'
@@ -197,7 +197,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     steps:
     - template: templates/release-ReleaseToNuGet.yml
@@ -206,7 +206,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMSUbuntu20.04TLS
+      - ImageOverride -equals PSMMSUbuntu20.04-Secure
 
     variables:
     - group: 'AzDevOpsArtifacts'
@@ -280,7 +280,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Azure Blob variable group'
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -18,7 +18,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -19,7 +19,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   timeoutInMinutes: 15
 
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -15,7 +15,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   steps:
   #- task: <task type name>@<version>
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMSUbuntu20.04TLS
+    - ImageOverride -equals PSMMSUbuntu20.04-Secure
   dependsOn: ${{ parameters.parentJob }}
   variables:
     - name: runCodesignValidationInjection
@@ -149,7 +149,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: buildName
       value: ${{ parameters.buildName }}
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -9,7 +9,7 @@ jobs:
     pool:
       name: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
       - group: ESRP
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -9,7 +9,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - group: ESRP
     - name: runCodesignValidationInjection
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   timeoutInMinutes: 90
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -0,0 +1,73 @@
+jobs:
+- job: CreateMSIXBundle
+  displayName: Create .msixbundle file
+
+  pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+
+  variables:
+    - group: msixTools
+    - group: 'Azure Blob variable group'
+
+  steps:
+    - template: release-SetReleaseTagAndContainerName.yml
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: finalResults
+        patterns: '**/*.msix'
+        path: '$(Pipeline.Workspace)\releasePipeline\msix'
+
+    - pwsh: |
+        $cmd = Get-Command makeappx.exe -ErrorAction Ignore
+        if ($cmd) {
+            Write-Verbose -Verbose 'makeappx available in PATH'
+            $exePath = $cmd.Source
+        } else {
+            $toolsDir = '$(Pipeline.Workspace)\releasePipeline\tools'
+            New-Item $toolsDir -Type Directory -Force > $null
+            Invoke-RestMethod -Uri '$(makeappUrl)' -OutFile "$toolsDir\makeappx.zip"
+            Expand-Archive "$toolsDir\makeappx.zip" -DestinationPath "$toolsDir\makeappx" -Force
+            $exePath = "$toolsDir\makeappx\makeappx.exe"
+
+            Write-Verbose -Verbose 'makeappx was installed:'
+            Get-ChildItem -Path $toolsDir -Recurse
+        }
+
+        $vstsCommandString = "vso[task.setvariable variable=MakeAppxPath]$exePath"
+        Write-Host "sending " + $vstsCommandString
+        Write-Host "##$vstsCommandString"
+      displayName: Install makeappx tool
+
+    - pwsh: |
+        $sourceDir = '$(Pipeline.Workspace)\releasePipeline\msix'
+        $file = Get-ChildItem $sourceDir | Select-Object -First 1
+        $prefix = ($file.BaseName -split "-win")[0]
+        $pkgName = "$prefix.msixbundle"
+        Write-Verbose -Verbose "Creating $pkgName"
+
+        $makeappx = '$(MakeAppxPath)'
+        $outputDir = "$sourceDir\output"
+        New-Item $outputDir -Type Directory -Force > $null
+        & $makeappx bundle /d $sourceDir /p "$outputDir\$pkgName"
+
+        Get-ChildItem -Path $sourceDir -Recurse
+        $vstsCommandString = "vso[task.setvariable variable=BundleDir]$outputDir"
+        Write-Host "sending " + $vstsCommandString
+        Write-Host "##$vstsCommandString"
+      displayName: Create MsixBundle
+
+    - pwsh: |
+        ## We use AzCopy v8.1 in our release pipeline, see the documentation at:
+        ## https://docs.microsoft.com/en-us/previous-versions/azure/storage/storage-use-azcopy
+
+        $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+        & $azcopy /Source:$(BundleDir) /Dest:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)-private /DestKey:$(StorageAccountKey) /Pattern:*.msixbundle /Y
+      displayName: Upload MSIX Bundle package to Az Blob
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -4,7 +4,7 @@ jobs:
 
   pool: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   variables:
   - group: 'Azure Blob variable group'
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -7,7 +7,7 @@ jobs:
   condition: succeeded()
   pool: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -12,7 +12,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   steps:
   - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: runCodesignValidationInjection
       value: false
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: BuildConfiguration
       value: ${{ parameters.BuildConfiguration }}
diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -27,7 +27,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     steps:
     - checkout: self

Original file line number	Diff line number	Diff line change
`@@ -946,7 +946,15 @@ function New-UnixPackage {`
`946`	`946`	`try {`
`947`	`947`	`if ($PSCmdlet.ShouldProcess("Create $type package")) {`
`948`	`948`	`Write-Log "Creating package with fpm..."`
`949`		`- $Output = Start-NativeExecution { fpm $Arguments }`
	`949`	`+ try {`
	`950`	`+ $Output = Start-NativeExecution { fpm $Arguments }`
	`951`	`+ }`
	`952`	`+ catch {`
	`953`	`+ Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue`
	`954`	`+ Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue`
	`955`	`+ Get-Error -InputObject $_`
	`956`	`+ throw`
	`957`	`+ }`
`950`	`958`	`}`
`951`	`959`	`} finally {`
`952`	`960`	`if ($Environment.IsMacOS) {`
`@@ -3947,7 +3955,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {`
`3947`	`3955`	`}`
`3948`	`3956`	`}`
`3949`	`3957`	`catch {`
`3950`		`- Get-Error`
	`3958`	`+ Get-Error -InputObject $_`
`3951`	`3959`	`throw`
`3952`	`3960`	`}`
`3953`	`3961`	`}`
`@@ -4032,7 +4040,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {`
`4032`	`4040`	`}`
`4033`	`4041`	`}`
`4034`	`4042`	`catch {`
`4035`		`- Get-Error`
	`4043`	`+ Get-Error -InputObject $_`
`4036`	`4044`	`throw`
`4037`	`4045`	`}`
`4038`	`4046`	`}`