Skip to content

Commit 044438e

Browse files
authored
Add MatrixFilters and NonSparseParameter support to live test configs (Azure#18703)
* Add MatrixFilters and NonSparseParameter support to live test configs * simplify keyvault live test config
1 parent 8890990 commit 044438e

File tree

2 files changed

+32
-16
lines changed

2 files changed

+32
-16
lines changed

eng/pipelines/templates/jobs/archetype-sdk-tests-generate.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ parameters:
77
- name: MatrixConfigs
88
type: object
99
default: []
10+
- name: MatrixFilters
11+
type: object
12+
default: []
1013

1114
jobs:
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') }}:

eng/pipelines/templates/stages/archetype-sdk-tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ parameters:
6565
- name: AdditionalMatrixConfigs
6666
type: object
6767
default: []
68+
- name: MatrixFilters
69+
type: object
70+
default: []
6871
- name: PlatformPreSteps
6972
type: object
7073
default:
@@ -124,6 +127,10 @@ stages:
124127
- ${{ config }}
125128
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
126129
- ${{ config }}
130+
MatrixFilters:
131+
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
132+
- ${{ cloudFilter }}
133+
- ${{ parameters.MatrixFilters }}
127134
CloudConfig:
128135
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
129136
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}

0 commit comments

Comments
 (0)