Skip to content

Switch to our custom images for build and release #16801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 8 commits into from
Jan 26, 2022
Merged

Switch to our custom images for build and release #16801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
831dc8d
switch to our custom images
TravisEz13 Jan 20, 2022
fcffa1b
switch to custom ubuntu images
TravisEz13 Jan 24, 2022
bd81ee0
add error diags for fpm failure
TravisEz13 Jan 25, 2022
26b8c10
fix typo
TravisEz13 Jan 25, 2022
8294a00
fix get-error in catch
TravisEz13 Jan 25, 2022
20a90d5
set fpm to debug
TravisEz13 Jan 25, 2022
da4b9e6
Revert "set fpm to debug"
TravisEz13 Jan 25, 2022
7e373f7
add rpm to required packages
TravisEz13 Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,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) {
Expand Down Expand Up @@ -4147,7 +4155,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
}
}
catch {
Get-Error
Get-Error -InputObject $_
throw
}
}
Expand Down Expand Up @@ -4228,7 +4236,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
}
}
catch {
Get-Error
Get-Error -InputObject $_
throw
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/releaseBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ stages:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
steps:
- checkout: self
clean: true
Expand Down
10 changes: 5 additions & 5 deletions tools/releaseBuild/azureDevOps/releasePipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ stages:

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

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

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

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

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

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

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

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

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

variables:
- group: 'Azure Blob variable group'
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
steps:
- checkout: self
clean: true
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/compliance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

# APIScan can take a long time
timeoutInMinutes: 180
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

# APIScan can take a long time
timeoutInMinutes: 180
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

timeoutInMinutes: 15

Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/json.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

steps:
#- task: <task type name>@<version>
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMSUbuntu20.04TLS
- ImageOverride -equals PSMMSUbuntu20.04-Secure
dependsOn: ${{ parameters.parentJob }}
variables:
- name: runCodesignValidationInjection
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
variables:
- name: buildName
value: ${{ parameters.buildName }}
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

variables:
- group: ESRP
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
variables:
- group: ESRP
- name: runCodesignValidationInjection
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

timeoutInMinutes: 90

Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:

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

variables:
- group: msixTools
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:

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

variables:
- group: 'Azure Blob variable group'
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
condition: succeeded()
pool: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
steps:
- checkout: self
clean: true
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure

steps:
- checkout: self
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
variables:
- name: runCodesignValidationInjection
value: false
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
pool:
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals PSMMS2019-Secure
variables:
- name: BuildConfiguration
value: ${{ parameters.BuildConfiguration }}
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/vpackRelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stages:

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

steps:
- checkout: self
Expand Down