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

2022-01-26 11:47:14 -08:00 · 2022-01-26 11:47:14 -08:00 · f5381d5694
commit f5381d5694
parent 64ff0fc799
21 changed files with 36 additions and 28 deletions
--- a/build.psm1
+++ b/build.psm1
@ -1938,7 +1938,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
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@ -982,7 +982,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) {
@ -4097,7 +4105,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
        }
    }
    catch {
-        Get-Error
+        Get-Error -InputObject $_
        throw
    }
 }
@ -4178,7 +4186,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
        }
    }
    catch {
-        Get-Error
+        Get-Error -InputObject $_
        throw
    }
 }
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@ -207,7 +207,7 @@ stages:
        pool:
          name: PowerShell1ES
          demands:
-          - ImageOverride -equals MMS2019TLS
+          - ImageOverride -equals PSMMS2019-Secure
        steps:
        - checkout: self
          clean: true
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@ -179,7 +179,7 @@ stages:

    pool: PowerShell1ES
      demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure

    variables:
    - group: 'Staging_ACR'
@ -195,7 +195,7 @@ stages:

    pool: PowerShell1ES
      demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure

    variables:
    - group: 'Azure Blob variable group'
@ -231,7 +231,7 @@ stages:

    pool: PowerShell1ES
      demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure

    steps:
    - template: templates/release-ReleaseToNuGet.yml
@ -240,7 +240,7 @@ stages:

    pool: PowerShell1ES
      demands:
-      - ImageOverride -equals MMSUbuntu20.04TLS
+      - ImageOverride -equals PSMMSUbuntu20.04-Secure

    variables:
    - group: 'AzDevOpsArtifacts'
@ -337,7 +337,7 @@ stages:

    pool: PowerShell1ES
      demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure

    variables:
    - group: 'Azure Blob variable group'
--- 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
--- 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
--- 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
--- 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

--- 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>
--- 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
@ -151,7 +151,7 @@ jobs:
  pool:
    name: PowerShell1ES
    demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
  variables:
    - name: buildName
      value: ${{ parameters.buildName }}
--- 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
--- 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
--- 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

--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@ -4,7 +4,7 @@ jobs:

  pool: PowerShell1ES
    demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure

  variables:
    - group: msixTools
--- 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'
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@ -10,7 +10,7 @@ jobs:
  condition: succeeded()
  pool: PowerShell1ES
    demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
  steps:
  - checkout: self
    clean: true
--- 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
--- 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
--- 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
--- 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 }}
--- 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