From 2ea9f9f9ffba29a7273d75f29396305a3ce0eb1e Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 23 Apr 2024 15:32:56 -0700 Subject: [PATCH] Use correct signing certificates for RPM and DEBs (#21522) --- .pipelines/PowerShell-Packages-Official.yml | 2 ++ .pipelines/templates/linux-package-build.yml | 5 ++++- .vsts-ci/linux.yml | 2 ++ .vsts-ci/mac.yml | 2 ++ .vsts-ci/windows.yml | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.pipelines/PowerShell-Packages-Official.yml b/.pipelines/PowerShell-Packages-Official.yml index edd4692298..6d788cfe70 100644 --- a/.pipelines/PowerShell-Packages-Official.yml +++ b/.pipelines/PowerShell-Packages-Official.yml @@ -149,6 +149,7 @@ extends: signedDrop: 'drop_linux_sign_linux_fxd_x64_mariner' packageType: rpm-fxdependent #mariner-x64 jobName: mariner_x64 + signingProfile: 'CP-459159-Pgp' - template: /.pipelines/templates/linux-package-build.yml@self parameters: @@ -156,6 +157,7 @@ extends: signedDrop: 'drop_linux_sign_linux_fxd_arm64_mariner' packageType: rpm-fxdependent-arm64 #mariner-arm64 jobName: mariner_arm64 + signingProfile: 'CP-459159-Pgp' - template: /.pipelines/templates/linux-package-build.yml@self parameters: diff --git a/.pipelines/templates/linux-package-build.yml b/.pipelines/templates/linux-package-build.yml index 34b85bbdb0..a9f02c0265 100644 --- a/.pipelines/templates/linux-package-build.yml +++ b/.pipelines/templates/linux-package-build.yml @@ -3,6 +3,7 @@ parameters: signedeDrop: 'drop_linux_sign_linux_x64' packageType: deb jobName: 'deb' + signingProfile: 'CP-450779-Pgp' jobs: - job: ${{ parameters.jobName }} @@ -35,6 +36,8 @@ jobs: value: $(Build.SourcesDirectory)/PowerShell/.config/tsaoptions.json - name: ob_sdl_credscan_suppressionsFile value: $(Build.SourcesDirectory)/PowerShell/.config/suppress.json + - name: SigningProfile + value: ${{ parameters.signingProfile }} steps: - checkout: self @@ -162,7 +165,7 @@ jobs: displayName: Sign deb and rpm packages inputs: command: 'sign' - signing_profile: CP-459159-pgpdetached + signing_profile: '$(SigningProfile)' files_to_sign: '**/*.rpm;**/*.deb' search_root: '$(Pipeline.Workspace)' diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml index f362c6c231..c1a1fd5c0a 100644 --- a/.vsts-ci/linux.yml +++ b/.vsts-ci/linux.yml @@ -24,6 +24,7 @@ trigger: - .github/ISSUE_TEMPLATE/* - .github/workflows/* - .dependabot/config.yml + - .pipelines/* - test/perf/* pr: branches: @@ -50,6 +51,7 @@ pr: - tools/releaseBuild/azureDevOps/templates/* - README.md - .spelling + - .pipelines/* variables: DOTNET_CLI_TELEMETRY_OPTOUT: 1 diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml index 11c5a51aeb..9e297cf4ae 100644 --- a/.vsts-ci/mac.yml +++ b/.vsts-ci/mac.yml @@ -16,6 +16,7 @@ trigger: - .github/ISSUE_TEMPLATE/* - .github/workflows/* - .dependabot/config.yml + - .pipelines/* - test/perf/* pr: branches: @@ -42,6 +43,7 @@ pr: - tools/releaseBuild/azureDevOps/templates/* - README.md - .spelling + - .pipelines/* variables: DOTNET_CLI_TELEMETRY_OPTOUT: 1 diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml index 86843fe29a..ca5352cb4e 100644 --- a/.vsts-ci/windows.yml +++ b/.vsts-ci/windows.yml @@ -16,6 +16,7 @@ trigger: - .github/workflows/* - .dependabot/config.yml - test/perf/* + - .pipelines/* pr: branches: include: @@ -39,6 +40,7 @@ pr: - tools/releaseBuild/azureDevOps/templates/* - README.md - .spelling + - .pipelines/* variables: GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"