From 85e9195ad70808e137fb0dbbd02cd970b89017ba Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Thu, 2 Feb 2023 14:01:50 -0800 Subject: [PATCH 1/3] Always release to vcpkg when doing Daily Release --- eng/pipelines/templates/steps/vcpkg-publish.yml | 1 + eng/scripts/Test-ShouldReleaseToVcpkg.ps1 | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/vcpkg-publish.yml b/eng/pipelines/templates/steps/vcpkg-publish.yml index e732f5aded..4159a8637c 100644 --- a/eng/pipelines/templates/steps/vcpkg-publish.yml +++ b/eng/pipelines/templates/steps/vcpkg-publish.yml @@ -32,6 +32,7 @@ steps: -ReleaseArtifactSourceDirectory "${{ parameters.Workspace }}/packages/${{ parameters.ArtifactName }}" -VcpkgFolder ${{ parameters.Workspace }}/vcpkg -VcpkgPortName '${{ parameters.VcpkgPortName }}' + -DailyRelease:$${{ parameters.DailyRelease }} displayName: Check whether to release to vcpkg - task: Powershell@2 diff --git a/eng/scripts/Test-ShouldReleaseToVcpkg.ps1 b/eng/scripts/Test-ShouldReleaseToVcpkg.ps1 index 57c6979d0f..7df31de20a 100644 --- a/eng/scripts/Test-ShouldReleaseToVcpkg.ps1 +++ b/eng/scripts/Test-ShouldReleaseToVcpkg.ps1 @@ -1,13 +1,20 @@ param( [string] $ReleaseArtifactSourceDirectory, [string] $VcpkgFolder, - [string] $VcpkgPortName + [string] $VcpkgPortName, + [switch] $DailyRelease ) ."$PSSCriptRoot/../common/scripts/common.ps1" Set-StrictMode -Version 3 +if ($DailyRelease) { + Write-Host "Release is daily, publish to vcpkg" + Write-Host "##vso[task.setvariable variable=PublishToVcpkg]true" + exit 0 +} + $packageJsonContents = Get-Content ` -Path "$ReleaseArtifactSourceDirectory/package-info.json" ` -Raw From e19e9f45d91a1000f5f4301de318cb44d4580dfa Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Thu, 2 Feb 2023 14:21:02 -0800 Subject: [PATCH 2/3] Add ability to skip live tests via variable --- eng/pipelines/templates/jobs/live.tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index 3e68391299..f856cda4d0 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -43,7 +43,7 @@ parameters: jobs: - job: ValidateLive dependsOn: ${{ parameters.DependsOn }} - condition: ne(${{ parameters.Matrix }}, '{}') + condition: and(ne(variables['Skip.LiveTest'], 'true'), ne(${{ parameters.Matrix }}, '{}')) timeoutInMinutes: ${{ parameters.TimeoutInMinutes }} pool: name: $(Pool) From e74e94562b43b818549b4a3e8d36413a2b9b1c05 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Thu, 2 Feb 2023 14:31:50 -0800 Subject: [PATCH 3/3] Use 1ES agents instead of Azure Pipelines --- eng/pipelines/templates/stages/platform-matrix-live.json | 2 +- eng/pipelines/templates/stages/platform-matrix.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index e65f4e6bc3..1f0ff26775 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -126,7 +126,7 @@ { "StaticConfigs": { "Win2022": { - "Pool": "Azure Pipelines", + "Pool": "azsdk-pool-mms-win-2022-general", "OSVmImage": "windows-2022", "CMAKE_GENERATOR": "Visual Studio 17 2022", "RunProxyTests": true diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 59d9b06dfd..8dac3921c3 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -79,7 +79,7 @@ "StaticConfigs": { "Win2022": { "OSVmImage": "windows-2022", - "Pool": "Azure Pipelines", + "Pool": "azsdk-pool-mms-win-2022-general", "RunProxyTests": true, "CMAKE_GENERATOR": "Visual Studio 17 2022" }