From d6cc3fb2dbcf4a61f08bd2390ca656e5564260f7 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Mon, 7 Apr 2025 09:25:45 -0700
Subject: [PATCH] Add env var skip for matrix debug. Add acceptance test tag
 (#6512)

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
---
 .../scripts/job-matrix/Create-JobMatrix.ps1   |  5 ++-
 .../job-matrix/job-matrix-functions.ps1       | 44 +++++++++----------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/eng/common/scripts/job-matrix/Create-JobMatrix.ps1 b/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
index fe98ca172..3fc4a3255 100644
--- a/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
+++ b/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
@@ -15,6 +15,8 @@ param (
     [Parameter(Mandatory=$False)][array] $Filters,
     [Parameter(Mandatory=$False)][array] $Replace,
     [Parameter(Mandatory=$False)][array] $NonSparseParameters,
+    # Use for local generation/debugging when env: values are set in a matrix
+    [Parameter(Mandatory=$False)][switch] $SkipEnvironmentVariables,
     [Parameter()][switch] $CI = ($null -ne $env:SYSTEM_TEAMPROJECTID)
 )
 
@@ -34,7 +36,8 @@ $Filters = $Filters | Where-Object { $_ }
     -displayNameFilter $DisplayNameFilter `
     -filters $Filters `
     -replace $Replace `
-    -nonSparseParameters $NonSparseParameters
+    -nonSparseParameters $NonSparseParameters `
+    -skipEnvironmentVariables:$SkipEnvironmentVariables
 
 $serialized = SerializePipelineMatrix $matrix
 
diff --git a/eng/common/scripts/job-matrix/job-matrix-functions.ps1 b/eng/common/scripts/job-matrix/job-matrix-functions.ps1
index acfb6da29..68a082b72 100644
--- a/eng/common/scripts/job-matrix/job-matrix-functions.ps1
+++ b/eng/common/scripts/job-matrix/job-matrix-functions.ps1
@@ -101,8 +101,8 @@ function GenerateMatrix(
 ) {
     $result = ProcessImport $config.matrixParameters $selectFromMatrixType $nonSparseParameters $config.displayNamesLookup
 
-    $matrixParameters          = $result.Matrix
-    $importedMatrix            = $result.ImportedMatrix
+    $matrixParameters = $result.Matrix
+    $importedMatrix = $result.ImportedMatrix
     $combinedDisplayNameLookup = $result.DisplayNamesLookup
 
     if ($selectFromMatrixType -eq "sparse") {
@@ -148,7 +148,7 @@ function ProcessNonSparseParameters(
     $nonSparse = [MatrixParameter[]]@()
 
     foreach ($param in $parameters) {
-        if ($null -eq $param){
+        if ($null -eq $param) {
             continue
         }
         if ($param.Name -in $nonSparseParameters) {
@@ -430,9 +430,9 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
     }
     if ((!$matrix -and !$importPath) -or !$importPath) {
         return [PSCustomObject]@{
-            Matrix                = $matrix
-            ImportedMatrix        = @()
-            DisplayNamesLookup    = $displayNamesLookup
+            Matrix             = $matrix
+            ImportedMatrix     = @()
+            DisplayNamesLookup = $displayNamesLookup
         }
     }
 
@@ -456,9 +456,9 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
     }
 
     return [PSCustomObject]@{
-        Matrix                = $matrix ?? @()
-        ImportedMatrix        = $importedMatrix
-        DisplayNamesLookup    = $combinedDisplayNameLookup
+        Matrix             = $matrix ?? @()
+        ImportedMatrix     = $importedMatrix
+        DisplayNamesLookup = $combinedDisplayNameLookup
     }
 }
 
@@ -643,7 +643,7 @@ function InitializeMatrix {
 function GetMatrixDimensions([MatrixParameter[]]$parameters) {
     $dimensions = @()
     foreach ($param in $parameters) {
-        if ($null -eq $param){
+        if ($null -eq $param) {
             continue
         }
         $dimensions += $param.Length()
@@ -760,12 +760,12 @@ function Get4dMatrixIndex([int]$index, [Array]$dimensions) {
 
 function GenerateMatrixForConfig {
     param (
-      [Parameter(Mandatory = $true)][string] $ConfigPath,
-      [Parameter(Mandatory = $true)][string] $Selection,
-      [Parameter(Mandatory = $false)][string] $DisplayNameFilter,
-      [Parameter(Mandatory = $false)][array] $Filters,
-      [Parameter(Mandatory = $false)][array] $Replace,
-      [Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
+        [Parameter(Mandatory = $true)][string] $ConfigPath,
+        [Parameter(Mandatory = $true)][string] $Selection,
+        [Parameter(Mandatory = $false)][string] $DisplayNameFilter,
+        [Parameter(Mandatory = $false)][array] $Filters,
+        [Parameter(Mandatory = $false)][array] $Replace,
+        [Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
     )
     $matrixFile = Join-Path $PSScriptRoot ".." ".." ".." ".." $ConfigPath
 
@@ -776,12 +776,12 @@ function GenerateMatrixForConfig {
     $Filters = $Filters | Where-Object { $_ }
 
     [array]$matrix = GenerateMatrix `
-      -config $config `
-      -selectFromMatrixType $Selection `
-      -displayNameFilter $DisplayNameFilter `
-      -filters $Filters `
-      -replace $Replace `
-      -nonSparseParameters $NonSparseParameters
+        -config $config `
+        -selectFromMatrixType $Selection `
+        -displayNameFilter $DisplayNameFilter `
+        -filters $Filters `
+        -replace $Replace `
+        -nonSparseParameters $NonSparseParameters
 
     return , $matrix
 }