@@ -7,6 +7,9 @@ parameters:
77- name : MatrixConfigs
88 type : object
99 default : []
10+ - name : MatrixFilters
11+ type : object
12+ default : []
1013
1114jobs :
1215- job : generate_matrix
@@ -19,26 +22,32 @@ jobs:
1922 steps :
2023 - ${{ each config in parameters.MatrixConfigs }} :
2124 - ${{ if eq(config.GenerateVMJobs, 'true') }} :
22- - pwsh : |
23- Write-Host "DISPLAY NAME FILTER: $(displayNameFilter)"
24- eng/scripts/job-matrix/Create-JobMatrix.ps1 `
25- -ConfigPath ${{ config.Path }} `
26- -Selection ${{ config.Selection }} `
27- -DisplayNameFilter "$(displayNameFilter)" `
28- -Filters @("container=^$", "SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}")
25+ - task : Powershell@2
26+ inputs :
27+ pwsh : true
28+ filePath : eng/scripts/job-matrix/Create-JobMatrix.ps1
29+ arguments : >
30+ -ConfigPath ${{ config.Path }}
31+ -Selection ${{ config.Selection }}
32+ -DisplayNameFilter "$(displayNameFilter)"
33+ -Filters "${{ join('","', parameters.MatrixFilters) }}","container=^$","SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}"
34+ -NonSparseParameters "${{ join('","', config.NonSparseParameters) }}"
35+ displayName : Generate VM Job Matrix ${{ config.Name }}
2936 name : generate_vm_job_matrix_${{ config.Name }}
30- displayName: Generate VM Job Matrix
3137
3238 - ${{ if eq(config.GenerateContainerJobs, 'true') }} :
33- - pwsh : |
34- Write-Host "DISPLAY NAME FILTER: $(displayNameFilter)"
35- eng/scripts/job-matrix/Create-JobMatrix.ps1 `
36- -ConfigPath ${{ config.Path }} `
37- -Selection ${{ config.Selection }} `
38- -DisplayNameFilter "$(displayNameFilter)" `
39- -Filters @("container=.*", "SupportedClouds=$^$|{{ parameters.CloudConfig.Cloud }}")
40- name: generate_container_job_matrix_${{ config.Name }}
39+ - task : Powershell@2
40+ inputs :
41+ pwsh : true
42+ filePath : eng/scripts/job-matrix/Create-JobMatrix.ps1
43+ arguments : >
44+ -ConfigPath ${{ config.Path }}
45+ -Selection ${{ config.Selection }}
46+ -DisplayNameFilter "$(displayNameFilter)"
47+ -Filters "${{ join('","', parameters.MatrixFilters) }}", "container=.*", "SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}"
48+ -NonSparseParameters "${{ join('","', config.NonSparseParameters) }}"
4149 displayName : Generate Container Job Matrix
50+ name : generate_container_job_matrix_${{ config.Name }}
4251
4352- ${{ each config in parameters.MatrixConfigs }} :
4453 - ${{ if eq(config.GenerateVMJobs, 'true') }} :
0 commit comments