Sync eng/common directory with azure-sdk-tools for PR 7854 (#28871)

Sync eng/common directory with azure-sdk-tools for PR Azure/azure-sdk-tools#7854 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow) Co-authored-by: Ben Broderick Phillips <[email protected]>
Azure · Mar 11, 2024 · ac9424e · ac9424e
1 parent ecbebf5
commit ac9424e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/eng/common/scripts/job-matrix/job-matrix-functions.ps1 b/eng/common/scripts/job-matrix/job-matrix-functions.ps1
@@ -96,7 +96,8 @@ function GenerateMatrix(
     [String]$displayNameFilter = ".*",
     [Array]$filters = @(),
     [Array]$replace = @(),
-    [Array]$nonSparseParameters = @()
+    [Array]$nonSparseParameters = @(),
+    [Switch]$skipEnvironmentVariables
 ) {
     $matrixParameters, $importedMatrix, $combinedDisplayNameLookup = `
         ProcessImport $config.matrixParameters $selectFromMatrixType $nonSparseParameters $config.displayNamesLookup
@@ -124,7 +125,9 @@ function GenerateMatrix(
 
     $matrix = FilterMatrix $matrix $filters
     $matrix = ProcessReplace $matrix $replace $combinedDisplayNameLookup
-    $matrix = ProcessEnvironmentVariableReferences $matrix $combinedDisplayNameLookup
+    if (!$skipEnvironmentVariables) {
+        $matrix = ProcessEnvironmentVariableReferences $matrix $combinedDisplayNameLookup
+    }
     $matrix = FilterMatrixDisplayName $matrix $displayNameFilter
     return $matrix
 }
@@ -427,10 +430,14 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
         exit 1
     }
     $importedMatrixConfig = GetMatrixConfigFromFile (Get-Content -Raw $importPath)
+    # Add skipEnvironmentVariables so we don't process environment variables on import
+    # because we want top level filters to work against the the env key, not the value.
+    # The environment variables will get resolved after the import.
     $importedMatrix = GenerateMatrix `
         -config $importedMatrixConfig `
         -selectFromMatrixType $selection `
-        -nonSparseParameters $nonSparseParameters
+        -nonSparseParameters $nonSparseParameters `
+        -skipEnvironmentVariables
 
     $combinedDisplayNameLookup = $importedMatrixConfig.displayNamesLookup
     foreach ($lookup in $displayNamesLookup.GetEnumerator()) {