Sync eng/common directory with azure-sdk-tools for PR 10129 (Azure#44793)

azure-sdk · scbedd · web-flow · commit 3a0d08363007 · 2025-03-25T15:19:41.000-07:00
* identify and fix the issue with no results on a matrix that is PRBatched. The platform filters eliminate all the jobs, which is why it only turned up on the second windows leg

---------

Co-authored-by: Scott Beddall &lt;scbedd@microsoft.com&gt;
diff --git a/eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1 b/eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1
@@ -144,7 +144,7 @@ function GeneratePRMatrixForBatch {
       }
     }
 
-    if ($matrixConfig.PSObject.Properties['PRBatching']) {
+    if ($matrixConfig.PSObject.Properties['PRBatching'] -and $matrixResults) {
       # if we are doing a PR Batch, we need to just add the matrix items directly to the OverallResult
       # as the users have explicitly disabled PR batching for this matrix.
       if (!$matrixConfig.PRBatching) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ function GeneratePRMatrixForBatch {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- if ($matrixConfig.PSObject.Properties['PRBatching']) {`
	`147`	`+ if ($matrixConfig.PSObject.Properties['PRBatching'] -and $matrixResults) {`
`148`	`148`	`# if we are doing a PR Batch, we need to just add the matrix items directly to the OverallResult`
`149`	`149`	`# as the users have explicitly disabled PR batching for this matrix.`
`150`	`150`	`if (!$matrixConfig.PRBatching) {`