From 831dc8d310ec92e7879ed769609c52cf928de371 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Wed, 19 Jan 2022 16:52:46 -0800 Subject: [PATCH 1/8] switch to our custom images --- tools/releaseBuild/azureDevOps/releaseBuild.yml | 2 +- tools/releaseBuild/azureDevOps/releasePipeline.yml | 8 ++++---- .../azureDevOps/templates/checkAzureContainer.yml | 2 +- tools/releaseBuild/azureDevOps/templates/compliance.yml | 2 +- .../azureDevOps/templates/compliance/compliance.yml | 2 +- .../azureDevOps/templates/compliance/generateNotice.yml | 2 +- tools/releaseBuild/azureDevOps/templates/json.yml | 2 +- tools/releaseBuild/azureDevOps/templates/linux.yml | 2 +- .../azureDevOps/templates/mac-file-signing.yml | 2 +- .../azureDevOps/templates/mac-package-signing.yml | 2 +- tools/releaseBuild/azureDevOps/templates/nuget.yml | 2 +- .../azureDevOps/templates/release-MsixBundle.yml | 2 +- .../azureDevOps/templates/release-UpdateDepsJson.yml | 2 +- .../azureDevOps/templates/vpackReleaseJob.yml | 2 +- .../templates/windows-component-governance.yml | 2 +- .../azureDevOps/templates/windows-hosted-build.yml | 2 +- .../azureDevOps/templates/windows-package-signing.yml | 2 +- .../azureDevOps/templates/windows-packaging.yml | 2 +- tools/releaseBuild/azureDevOps/vpackRelease.yml | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index 49fcb751472..97cb0d02eac 100644 --- 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 diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml index 7915ab537b9..6519f9edfaa 100644 --- 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 @@ -337,7 +337,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 index f9a2ee2dc64..49082849e9b 100644 --- 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 index 9eebd8be888..0c4a162bb11 100644 --- 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 index 92d5a7daec4..e81bdcf3709 100644 --- 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 index d904531d6c7..0e63dd9007b 100644 --- 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 index cbea46d9eea..714978022a5 100644 --- 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: @ diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index dc415c36c78..e64b6851521 100644 --- a/tools/releaseBuild/azureDevOps/templates/linux.yml +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -151,7 +151,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 index 648708fa4be..a5c5a0811ec 100644 --- 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 index b1cf9917424..e41d0609d4c 100644 --- 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 index b868c9dbdf7..ac4b181b7b8 100644 --- 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 index 1b424568994..607fda3ad40 100644 --- 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 diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml index f0c43c4b93f..bd465fedd27 100644 --- 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 index de6252bc6e3..10bc19044fb 100644 --- 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 diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml index 5719b4f272c..53947655d90 100644 --- 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 index 5d5484b14d8..16554ae7d41 100644 --- 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 index 8a45af1bc05..66bf7af7b3d 100644 --- 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 index 6b0d28b96f2..a93908a8f6c 100644 --- 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 index 03482479cbb..875e2d25c3c 100644 --- 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 From fcffa1bbc4705deb6202452662c25b6351effefe Mon Sep 17 00:00:00 2001 From: travis plunk Date: Mon, 24 Jan 2022 10:35:52 -0800 Subject: [PATCH 2/8] switch to custom ubuntu images --- tools/releaseBuild/azureDevOps/releasePipeline.yml | 2 +- tools/releaseBuild/azureDevOps/templates/linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml index 6519f9edfaa..49cc3536c20 100644 --- a/tools/releaseBuild/azureDevOps/releasePipeline.yml +++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml @@ -240,7 +240,7 @@ stages: pool: PowerShell1ES demands: - - ImageOverride -equals MMSUbuntu20.04TLS + - ImageOverride -equals PSMMSUbuntu20.04-Secure variables: - group: 'AzDevOpsArtifacts' diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index e64b6851521..3d9625201a0 100644 --- 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 From bd81ee0d63635020e1ebfb7e6a18acce8a23810d Mon Sep 17 00:00:00 2001 From: travis plunk Date: Mon, 24 Jan 2022 18:01:19 -0800 Subject: [PATCH 3/8] add error diags for fpm failure --- tools/packaging/packaging.psm1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 39028c2673c..6a3b0600318 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1019,7 +1019,14 @@ 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 $outDir -Verbose + Get-Error + throw + } } } finally { if ($Environment.IsMacOS) { From 26b8c10eedaeb7acb782c57ecd49db5da73f78d8 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Tue, 25 Jan 2022 09:21:06 -0800 Subject: [PATCH 4/8] fix typo --- tools/packaging/packaging.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 6a3b0600318..647c046bbae 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1023,7 +1023,8 @@ function New-UnixPackage { $Output = Start-NativeExecution { fpm $Arguments } } catch { - Write-Verbose $outDir -Verbose + Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue + Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue Get-Error throw } From 8294a00c96d0e46c6c66bfa16833f93790e88b44 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Tue, 25 Jan 2022 10:59:26 -0800 Subject: [PATCH 5/8] fix get-error in catch --- tools/packaging/packaging.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 647c046bbae..3b90f41a770 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1025,7 +1025,7 @@ function New-UnixPackage { catch { Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue - Get-Error + Get-Error -InputObject $_ throw } } @@ -4155,7 +4155,7 @@ function Invoke-AzDevOpsLinuxPackageCreation { } } catch { - Get-Error + Get-Error -InputObject $_ throw } } @@ -4236,7 +4236,7 @@ function Invoke-AzDevOpsLinuxPackageBuild { } } catch { - Get-Error + Get-Error -InputObject $_ throw } } From 20a90d5a21e6735d502b8ff2e745efc010c07dd1 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Tue, 25 Jan 2022 10:59:44 -0800 Subject: [PATCH 6/8] set fpm to debug --- tools/packaging/packaging.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 3b90f41a770..7e9988af1a5 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1020,7 +1020,7 @@ function New-UnixPackage { if ($PSCmdlet.ShouldProcess("Create $type package")) { Write-Log "Creating package with fpm..." try { - $Output = Start-NativeExecution { fpm $Arguments } + $Output = Start-NativeExecution { fpm --debug $Arguments } } catch { Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue From da4b9e6c10ba0716348059440a253e06e03a30d4 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Tue, 25 Jan 2022 12:58:25 -0800 Subject: [PATCH 7/8] Revert "set fpm to debug" This reverts commit 20a90d5a21e6735d502b8ff2e745efc010c07dd1. --- tools/packaging/packaging.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 7e9988af1a5..3b90f41a770 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1020,7 +1020,7 @@ function New-UnixPackage { if ($PSCmdlet.ShouldProcess("Create $type package")) { Write-Log "Creating package with fpm..." try { - $Output = Start-NativeExecution { fpm --debug $Arguments } + $Output = Start-NativeExecution { fpm $Arguments } } catch { Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue From 7e373f755afc5074fde1616d67afd0805dbe6c55 Mon Sep 17 00:00:00 2001 From: travis plunk Date: Tue, 25 Jan 2022 14:07:33 -0800 Subject: [PATCH 8/8] add rpm to required packages --- build.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.psm1 b/build.psm1 index 4330011863e..3bfdcc4b46f 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1942,7 +1942,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