we now pass the combined MatrixConfigs through to the Create-PRJobMatrix. they are treated as the default, versus some PRMatrix setting that is manually set

Author: scbedd

eng/common/pipelines/templates/jobs/generate-job-matrix.yml

@@ -45,9 +45,9 @@ parameters:
 - name: EnablePRGeneration
   type: boolean
   default: false
-- name: PRMatrix
-  type: object
-# Mappings to OS name required at template compile time by 1es pipeline templates
+- name: PRMatrixSetting
+  type: string
+  default: 'ArtifactPackageNames'
 - name: Pools
   type: object
   default:
@@ -124,16 +124,16 @@ jobs:
       # Not currently not hardcoded, so not doing the needful and populating this folder before we hit this step will result in generation errors.
     - ${{ else }}:
       - ${{ each pool in parameters.Pools }}:
-        - task: Powershell@2
-          inputs:
-            pwsh: true
-            filePath: eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1
-            arguments: >
-              -PackagePropertiesFolder $(Build.ArtifactStagingDirectory)/PackageInfo
-              -PRMatrixFile ${{ parameters.PRMatrix.Path }}
-              -PRMatrixSetting ${{ parameters.PRMatrix.Setting }}
-              -DisplayNameFilter '$(displayNameFilter)'
-              -Filters '${{ join(''',''', parameters.MatrixFilters) }}', 'container=^$', 'SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}', 'Pool=${{ pool.filter }}'
+        - pwsh: |
+            # dump the conglomerated CI matrix
+            '${{ convertToJson(parameters.MatrixConfigs) }}' | Set-Content matrix.json
+
+            ./eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1 `
+              -PackagePropertiesFolder $(Build.ArtifactStagingDirectory)/PackageInfo `
+              -PRMatrixFile matrix.json `
+              -PRMatrixSetting ${{ parameters.PRMatrixSetting }} `
+              -DisplayNameFilter '$(displayNameFilter)' `
+              -Filters '${{ join(''',''', parameters.MatrixFilters) }}', 'container=^$', 'SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}', 'Pool=${{ pool.filter }}' `
               -Replace '${{ join(''',''', parameters.MatrixReplace) }}'
           displayName: Create ${{ pool.name }} PR Matrix
           name: vm_job_matrix_pr_${{ pool.name }}

eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1

@@ -49,18 +49,14 @@ if (!(Test-Path $PackagePropertiesFolder)) {
   exit 1
 }
 
+if (!(Test-Path $PRMatrixFile)) {
+  Write-Error "PR Matrix file doesn't exist"
+  exit 1
+}
+
 Write-Host "Generating PR job matrix for $PackagePropertiesFolder"
 
-# this will become a parameter in the future, we will pass MatrixConfigs as a parameter
-# these will be the "default" matrices that we will use to generate the PR matrix in lieu of
-# a matrix file
-$configs = @(
-  [PsCustomObject]@{
-    Name      = "default_platform_matrix"
-    Path      = $PRMatrixFile
-    Selection = "sparse"
-  }
-)
+$configs = Get-Content -Raw $PRMatrixFile | ConvertFrom-Json | ForEach-Object { [PSCustomObject]$_ }
 
 # calculate general targeting information and create our batches prior to generating any matrix
 $packageProperties = Get-ChildItem -Recurse "$PackagePropertiesFolder" *.json `