Merge remote-tracking branch 'origin/main' into dev/duhowett/onebranch-custom-pool

build/pipelines/ob-nightly.yml

@@ -25,6 +25,14 @@ variables:
 extends:
   template: templates-v2/pipeline-onebranch-full-release-build.yml
   parameters:
+    largeBuildPool:
+      type: windows
+      isCustom: true
+      name: SHINE-INT-L
+    smallBuildPool:
+      type: windows
+      isCustom: true
+      name: SHINE-INT-S
     official: true
     branding: Canary
     buildTerminal: true
@@ -46,7 +54,10 @@ extends:
       extraPublishJobs:
         - template: build/pipelines/templates-v2/job-deploy-to-azure-storage.yml@self
           parameters:
-            pool: { type: windows }
+            pool:
+              type: windows
+              isCustom: true
+              name: SHINE-INT-S
             variables:
               ob_git_checkout: false # This job checks itself out
               ob_git_skip_checkout_none: true

build/pipelines/templates-v2/job-build-project.yml

@@ -187,28 +187,17 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  - ${{ if eq(parameters.publishArtifacts, true) }}:
-    - publish: $(Build.SourcesDirectory)/msbuild.binlog
-      artifact: logs-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-      condition: always()
-      displayName: Publish Build Log
-    - ${{ if eq(parameters.enableCaching, true) }}:
-      - publish: $(Build.SourcesDirectory)\MSBuildCacheLogs
-        artifact: logs-msbuildcache-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
-        condition: always()
-        displayName: Publish MSBuildCache Logs
-  - ${{ else }}:
+  - task: CopyFiles@2
+    displayName: Copy Build Log
+    inputs:
+      contents: $(Build.SourcesDirectory)/msbuild.binlog
+      TargetFolder: $(Terminal.BinDir)
+  - ${{ if eq(parameters.enableCaching, true) }}:
     - task: CopyFiles@2
-      displayName: Copy Build Log
+      displayName: Copy MSBuildCache Logs
       inputs:
-        contents: $(Build.SourcesDirectory)/msbuild.binlog
-        TargetFolder: $(Terminal.BinDir)
-    - ${{ if eq(parameters.enableCaching, true) }}:
-      - task: CopyFiles@2
-        displayName: Copy MSBuildCache Logs
-        inputs:
-          contents: $(Build.SourcesDirectory)/MSBuildCacheLogs/**
-          TargetFolder: $(Terminal.BinDir)/MSBuildCacheLogs
+        contents: $(Build.SourcesDirectory)/MSBuildCacheLogs/**
+        TargetFolder: $(Terminal.BinDir)/MSBuildCacheLogs
 
   # This saves ~2GiB per architecture. We won't need these later.
   # Removes:
@@ -338,3 +327,4 @@ jobs:
     - publish: $(Terminal.BinDir)
       artifact: $(JobOutputArtifactName)
       displayName: Publish All Outputs
+      condition: always()

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -63,6 +63,12 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
+  - name: largeBuildPool
+    type: object
+    default: { type: windows }
+  - name: smallBuildPool
+    type: object
+    default: { type: windows }
 
 resources:
   repositories:
@@ -109,7 +115,7 @@ extends:
         jobs:
           - template: ./build/pipelines/templates-v2/job-build-project.yml@self
             parameters:
-              pool: { type: windows }
+              pool: ${{ parameters.largeBuildPool }}
               variables:
                 ob_sdl_checkcflags_enabled: false # BAD-FLAGS
                 ob_sdl_xfgcheck_enabled: false # BAD-FLAGS
@@ -117,7 +123,7 @@ extends:
                 ob_git_skip_checkout_none: true
                 ob_outputDirectory: $(JobOutputDirectory)
                 ob_artifactBaseName: $(JobOutputArtifactName)
-              publishArtifacts: false # Handled by OneBranch
+              publishArtifacts: ${{ contains(convertToJson(parameters.largeBuildPool), 'isCustom') }}
               branding: ${{ parameters.branding }}
               buildTerminal: ${{ parameters.buildTerminal }}
               buildConPTY: ${{ parameters.buildConPTY }}
@@ -143,7 +149,7 @@ extends:
             # Add an Any CPU build flavor for the WPF control bits
             - template: ./build/pipelines/templates-v2/job-build-project.yml@self
               parameters:
-                pool: { type: windows }
+                pool: ${{ parameters.largeBuildPool }}
                 variables:
                   ob_sdl_checkcflags_enabled: false # BAD-FLAGS
                   ob_sdl_xfgcheck_enabled: false # BAD-FLAGS
@@ -151,7 +157,7 @@ extends:
                   ob_git_skip_checkout_none: true
                   ob_outputDirectory: $(JobOutputDirectory)
                   ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
+                publishArtifacts: ${{ contains(convertToJson(parameters.largeBuildPool), 'isCustom') }}
                 jobName: BuildWPF
                 branding: ${{ parameters.branding }}
                 buildTerminal: false
@@ -174,7 +180,10 @@ extends:
           - ${{ if eq(parameters.buildTerminal, true) }}:
             - template: ./build/pipelines/templates-v2/job-merge-msix-into-bundle.yml@self
               parameters:
-                pool: { type: windows }
+                ${{ if eq(false, parameters.publishVpackToWindows) }}:
+                  pool: ${{ parameters.smallBuildPool }}
+                ${{ else }}:
+                  pool: { type: windows } # Vpack builds need to run in the OneBranch pool (only)
                 variables:
                   ob_sdl_checkcflags_enabled: false # BAD-FLAGS
                   ob_sdl_xfgcheck_enabled: false # BAD-FLAGS
@@ -206,7 +215,7 @@ extends:
                   # DH: Don't ask why.
                   ob_updateOSManifest_destination: $(XES_VPACKMANIFESTDIRECTORY)
                   ob_updateOSManifest_skipFetch: true
-                publishArtifacts: false # Handled by OneBranch
+                publishArtifacts: ${{ and(eq(false, parameters.publishVpackToWindows), contains(convertToJson(parameters.smallBuildPool), 'isCustom')) }}
                 jobName: Bundle
                 branding: ${{ parameters.branding }}
                 buildConfigurations: ${{ parameters.buildConfigurations }}
@@ -228,7 +237,7 @@ extends:
           - ${{ if eq(parameters.buildConPTY, true) }}:
             - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
               parameters:
-                pool: { type: windows }
+                pool: ${{ parameters.smallBuildPool }}
                 variables:
                   ob_sdl_checkcflags_enabled: false # BAD-FLAGS
                   ob_sdl_xfgcheck_enabled: false # BAD-FLAGS
@@ -236,7 +245,7 @@ extends:
                   ob_git_skip_checkout_none: true
                   ob_outputDirectory: $(JobOutputDirectory)
                   ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
+                publishArtifacts: ${{ contains(convertToJson(parameters.smallBuildPool), 'isCustom') }}
                 buildConfigurations: ${{ parameters.buildConfigurations }}
                 buildPlatforms: ${{ parameters.buildPlatforms }}
                 generateSbom: false # this is handled by onebranch
@@ -246,7 +255,7 @@ extends:
           - ${{ if eq(parameters.buildWPF, true) }}:
             - template: ./build/pipelines/templates-v2/job-build-package-wpf.yml@self
               parameters:
-                pool: { type: windows }
+                pool: ${{ parameters.smallBuildPool }}
                 variables:
                   ob_sdl_checkcflags_enabled: false # BAD-FLAGS
                   ob_sdl_xfgcheck_enabled: false # BAD-FLAGS
@@ -254,7 +263,7 @@ extends:
                   ob_git_skip_checkout_none: true
                   ob_outputDirectory: $(JobOutputDirectory)
                   ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
+                publishArtifacts: ${{ contains(convertToJson(parameters.smallBuildPool), 'isCustom') }}
                 buildConfigurations: ${{ parameters.buildConfigurations }}
                 buildPlatforms: ${{ parameters.buildPlatforms }}
                 generateSbom: false # this is handled by onebranch
@@ -267,7 +276,7 @@ extends:
         jobs:
           - template: ./build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml@self
             parameters:
-              pool: { type: windows }
+              pool: ${{ parameters.smallBuildPool }}
               includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
               symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
               subscription: ${{ parameters.symbolPublishingSubscription }}