Always release to vcpkg when doing Daily Release (#4334)

* Always release to vcpkg when doing Daily Release * Add ability to skip live tests via variable * Use 1ES agents instead of Azure Pipelines
Azure · Mar 6, 2023 · 50589d6 · 50589d6
1 parent ab7b238
commit 50589d6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git 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)

diff --git 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
@@ -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"
         }

diff --git 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
@@ -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