Join in non-source-only even in PR.

Author: jkoritzinsky

eng/pipelines/templates/stages/vmr-build-with-join.yml

@@ -54,13 +54,16 @@ parameters:
 stages:
 # Insert all stages that build verticals
 # and publish artifacts for each vertical
-- ${{ each vertical in parameters.verticalsStages }}:
-  - ${{ insert }}: ${{ vertical }}
+- ${{ each stage in parameters.verticalsStages }}:
+  - ${{ insert }}: ${{ stage }}
 - ${{ if parameters.finalJoinCondition }}:
   # This stage should contain all jobs that take inputs from all verticals and determine the exact final outputs.
   - stage: VMR_Final_Join
     displayName: 'VMR Final Join'
-    dependsOn: ${{ parameters.verticalsStages.*.stage }}
+    dependsOn:
+    - ${{ each stage in parameters.verticalsStages }}:
+      - ${{ if ne(stage.templateContext.validationOnly, 'true') }}:
+        - ${{ stage.stage }}
     jobs:
       - job: FinalJoin
         displayName: Final Build Pass
@@ -70,10 +73,12 @@ stages:
           outputParentDirectory: $(Build.ArtifactStagingDirectory)/artifacts
           inputs:
             # Download the artifacts from every job in every vertical stage under VerticalArtifacts
-            - ${{ each vertical in parameters.verticalsStages.*.jobs.*.job }}:
-              - input: pipelineArtifact
-                path: $(Build.ArtifactStagingDirectory)/VerticalArtifacts/${{ vertical }}
-                artifactName: ${{ vertical }}_Artifacts
+            - ${{ each stage in parameters.verticalsStages }}:
+              - ${{ if ne(stage.templateContext.validationOnly, 'true') }}:
+                - ${{ each vertical in stage.jobs.*.job }}:
+                  - input: pipelineArtifact
+                    path: $(Build.ArtifactStagingDirectory)/VerticalArtifacts/${{ vertical.job }}
+                    artifactName: ${{ vertical.job }}_Artifacts
             - input: pipelineArtifact
               path: $(Build.ArtifactStagingDirectory)/VerticalManifests
               artifactName: VerticalManifests

eng/pipelines/templates/stages/vmr-build.yml

@@ -85,65 +85,66 @@ stages:
           isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
           scope: ${{ parameters.scope }}
           isSourceOnlyBuild: ${{ parameters.isSourceOnlyBuild }}
-    finalJoinCondition: ${{ and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}
+    finalJoinCondition: ${{ and(not(parameters.isSourceOnlyBuild), eq(parameters.scope, 'full')) }}
     postJoinStages:
-    - stage: Publish_Build_Assets
-      displayName: Publish Assets
-      jobs:
-      - template: /eng/common/templates-official/job/publish-build-assets.yml@self
-        parameters:
-          publishUsingPipelines: true
-          publishAssetsImmediately: true
-          pool: ${{ parameters.pool_Linux }}
+    - ${{ if and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+      - stage: Publish_Build_Assets
+        displayName: Publish Assets
+        jobs:
+        - template: /eng/common/templates-official/job/publish-build-assets.yml@self
+          parameters:
+            publishUsingPipelines: true
+            publishAssetsImmediately: true
+            pool: ${{ parameters.pool_Linux }}
 
-    - stage: VMR_Validation
-      displayName: VMR Validation
-      variables:
-      - template: ../variables/vmr-build.yml
-        parameters:
-          vmrBranch: ${{ parameters.vmrBranch }}
-          desiredSigning: ${{ parameters.desiredSigning }}
-      - group: Release-Pipeline
-      - group: DotNetBot-GitHub-AllBranches
-      jobs:
-      - job: ValidateAssetBaselines
-        displayName: Validate Asset Baselines
-        pool: ${{ parameters.pool_Windows }}
-        timeoutInMinutes: 180
-        steps:
-        - template: ../steps/vmr-validate-asset-baseline.yml
+      - stage: VMR_Validation
+        displayName: VMR Validation
+        variables:
+        - template: ../variables/vmr-build.yml
           parameters:
-            continueOnError: true
-      - ${{ if eq(variables.signEnabled, 'true') }}:
-        - job: ValidateSigning_Windows
-          displayName: Validate Signing - Windows
+            vmrBranch: ${{ parameters.vmrBranch }}
+            desiredSigning: ${{ parameters.desiredSigning }}
+        - group: Release-Pipeline
+        - group: DotNetBot-GitHub-AllBranches
+        jobs:
+        - job: ValidateAssetBaselines
+          displayName: Validate Asset Baselines
           pool: ${{ parameters.pool_Windows }}
-          timeoutInMinutes: 240
+          timeoutInMinutes: 180
           steps:
-          - template: ../steps/vmr-validate-signing.yml
+          - template: ../steps/vmr-validate-asset-baseline.yml
             parameters:
-              artifactName: PackageArtifacts
               continueOnError: true
-              OS: Windows_NT
+        - ${{ if eq(variables.signEnabled, 'true') }}:
+          - job: ValidateSigning_Windows
+            displayName: Validate Signing - Windows
+            pool: ${{ parameters.pool_Windows }}
+            timeoutInMinutes: 240
+            steps:
+            - template: ../steps/vmr-validate-signing.yml
+              parameters:
+                artifactName: PackageArtifacts
+                continueOnError: true
+                OS: Windows_NT
 
-        - job: ValidateSigning_Mac
-          displayName: Validate Signing - Mac
-          pool: ${{ parameters.pool_Mac }}
-          timeoutInMinutes: 240
-          steps:
-          - template: ../steps/vmr-validate-signing.yml
-            parameters:
-              artifactName: BlobArtifacts
-              continueOnError: true
-              OS: Darwin
+          - job: ValidateSigning_Mac
+            displayName: Validate Signing - Mac
+            pool: ${{ parameters.pool_Mac }}
+            timeoutInMinutes: 240
+            steps:
+            - template: ../steps/vmr-validate-signing.yml
+              parameters:
+                artifactName: BlobArtifacts
+                continueOnError: true
+                OS: Darwin
 
-        - job: ValidateSigning_Linux
-          displayName: Validate Signing - Linux
-          pool: ${{ parameters.pool_Linux }}
-          timeoutInMinutes: 240
-          steps:
-          - template: ../steps/vmr-validate-signing.yml
-            parameters:
-              artifactName: BlobArtifacts
-              continueOnError: true
-              OS: Linux
+          - job: ValidateSigning_Linux
+            displayName: Validate Signing - Linux
+            pool: ${{ parameters.pool_Linux }}
+            timeoutInMinutes: 240
+            steps:
+            - template: ../steps/vmr-validate-signing.yml
+              parameters:
+                artifactName: BlobArtifacts
+                continueOnError: true
+                OS: Linux

eng/pipelines/templates/stages/vmr-verticals.yml

@@ -355,6 +355,8 @@ stages:
 - ${{ if and(not(parameters.isSourceOnlyBuild), or(eq(variables['Build.Reason'], 'PullRequest'), ne(variables['System.TeamProject'], 'internal'))) }}:
   - stage: VMR_Vertical_Build_Validation
     displayName: VMR Vertical Build Validation
+    templateContext:
+      validationOnly: true
     dependsOn: []
     variables:
     - template: ../variables/vmr-build.yml