Skip to content

Commit c759481

Browse files
weshaggardweshaggard
authored
Update test configs to use new TME tenant (#37667)
- Update usgov and china configs to use default service connection
1 parent 5557c7a commit c759481

File tree

30 files changed

+90
-400
lines changed

30 files changed

+90
-400
lines changed

‎eng/pipelines/templates/jobs/live.tests.yml

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
default: ''
55
- name: TestResourceDirectories
66
type: object
7-
default:
7+
default: null
88
- name: PreSteps
99
type: object
1010
default: []
@@ -124,35 +124,20 @@ jobs:
124124
Pool: $(Pool)
125125
${{ insert }}: ${{ parameters.EnvVars }}
126126

127-
- ${{ if parameters.TestResourceDirectories }}:
128-
- ${{ each directory in parameters.TestResourceDirectories }}:
129-
- template: /eng/common/TestResources/deploy-test-resources.yml
130-
parameters:
131-
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
132-
ServiceDirectory: '${{ directory }}'
133-
SubscriptionConfiguration: $(SubscriptionConfiguration)
134-
ArmTemplateParameters: $(ArmTemplateParameters)
135-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
136-
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
137-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
138-
EnvVars:
139-
Pool: $(Pool)
140-
${{ insert }}: ${{ parameters.EnvVars }}
141-
- ${{ if not(parameters.TestResourceDirectories) }}:
142-
- template: /eng/common/TestResources/deploy-test-resources.yml
143-
parameters:
144-
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
145-
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
146-
SubscriptionConfiguration: $(SubscriptionConfiguration)
147-
ArmTemplateParameters: $(ArmTemplateParameters)
148-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
149-
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
150-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
151-
EnvVars:
152-
Pool: $(Pool)
153-
${{ insert }}: ${{ parameters.EnvVars }}
127+
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
128+
- template: /eng/common/TestResources/deploy-test-resources.yml
129+
parameters:
130+
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
131+
ServiceDirectory: '${{ directory }}'
132+
SubscriptionConfiguration: $(SubscriptionConfiguration)
133+
ArmTemplateParameters: $(ArmTemplateParameters)
134+
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
135+
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
136+
EnvVars:
137+
Pool: $(Pool)
138+
${{ insert }}: ${{ parameters.EnvVars }}
154139

155-
- template: ../steps/build-test.yml
140+
- template: /eng/pipelines/templates/steps/build-test.yml
156141
parameters:
157142
ServiceDirectory: ${{ parameters.ServiceDirectory }}
158143
CloudName: ${{ parameters.CloudConfig.Cloud }}
@@ -170,24 +155,13 @@ jobs:
170155
TestProxy: ${{ parameters.TestProxy }}
171156
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
172157
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
173-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
174158

175-
- ${{ if parameters.TestResourceDirectories }}:
176-
- ${{ each directory in parameters.TestResourceDirectories }}:
177-
- template: /eng/common/TestResources/remove-test-resources.yml
178-
parameters:
179-
ServiceDirectory: '${{ directory }}'
180-
SubscriptionConfiguration: $(SubscriptionConfiguration)
181-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
182-
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
183-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
184-
- ${{ if not(parameters.TestResourceDirectories) }}:
159+
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
185160
- template: /eng/common/TestResources/remove-test-resources.yml
186161
parameters:
187-
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
162+
ServiceDirectory: '${{ directory }}'
188163
SubscriptionConfiguration: $(SubscriptionConfiguration)
189164
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
190165
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
191-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
192166

193167
- ${{ parameters.PostSteps }}

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

Lines changed: 61 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,12 @@ parameters:
5757
type: object
5858
default:
5959
Public:
60-
ServiceConnection: azure-sdk-tests
61-
SubscriptionConfigurationFilePaths:
62-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
6360
Preview:
64-
ServiceConnection: azure-sdk-tests-preview
65-
SubscriptionConfigurationFilePaths:
66-
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
6761
Canary:
68-
ServiceConnection: azure-sdk-tests
69-
SubscriptionConfigurationFilePaths:
70-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
7162
Location: 'centraluseuap'
7263
UsGov:
73-
ServiceConnection: usgov_azure-sdk-tests
74-
SubscriptionConfigurationFilePaths:
75-
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
7664
China:
77-
ServiceConnection: china_azure-sdk-tests
78-
SubscriptionConfigurationFilePaths:
79-
- eng/common/TestResources/sub-config/AzureChinaMsft.json
65+
Location: 'chinanorth3'
8066
- name: MatrixConfigs
8167
type: object
8268
default:
@@ -107,131 +93,74 @@ parameters:
10793
default: 'whl'
10894
- name: Packages
10995
type: object
110-
default: []
96+
default: null
11197
- name: UseFederatedAuth
11298
type: boolean
11399
default: true
114100

115101
extends:
116102
template: /eng/pipelines/templates/stages/1es-redirect.yml
117103
parameters:
118-
Use1ESOfficial: false
119104
stages:
120-
- ${{ if ne(length(parameters.Packages), 0) }}:
121-
- ${{ each package in parameters.Packages }}:
122-
- ${{ each cloud in parameters.CloudConfig }}:
123-
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}:
124-
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
125-
- stage: ${{ cloud.key }}_${{ parameters.JobName }}_${{ replace(package, '-', '_') }}
126-
dependsOn: []
127-
jobs:
128-
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
129-
parameters:
130-
SparseCheckoutPaths:
131-
- sdk/${{ parameters.ServiceDirectory }}/**/*.json
132-
JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
133-
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
134-
Pool: azsdk-pool-mms-ubuntu-2004-general
135-
AdditionalParameters:
136-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
137-
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
138-
PreSteps:
139-
- ${{ parameters.PlatformPreSteps }}
140-
- ${{ parameters.PreSteps }}
141-
PostSteps:
142-
- ${{ parameters.PlatformPostSteps }}
143-
- ${{ parameters.PostSteps }}
144-
EnvVars: ${{ parameters.EnvVars }}
145-
MaxParallel: ${{ parameters.MaxParallel }}
146-
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
147-
AfterTestSteps: ${{ parameters.AfterTestSteps }}
148-
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
149-
BuildTargetingString: ${{ package }}
150-
TestMarkArgument: ${{ parameters.TestMarkArgument }}
151-
InjectedPackages: ${{ parameters.InjectedPackages }}
152-
BuildDocs: ${{ parameters.BuildDocs }}
153-
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
154-
TestProxy: ${{ parameters.TestProxy }}
155-
ToxTestEnv: ${{ parameters.ToxTestEnv }}
156-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
157-
MatrixConfigs:
158-
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
159-
- ${{ each config in parameters.MatrixConfigs }}:
160-
- ${{ config }}
161-
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
162-
- ${{ config }}
163-
MatrixFilters:
164-
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
165-
- ${{ cloudFilter }}
166-
- ${{ parameters.MatrixFilters }}
167-
MatrixReplace:
168-
- ${{ each cloudReplace in cloud.value.MatrixReplace }}:
169-
- ${{ cloudReplace }}
170-
- ${{ parameters.MatrixReplace }}
171-
CloudConfig:
172-
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
173-
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
174-
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
175-
Cloud: ${{ cloud.key }}
176-
ServiceConnection: ${{ cloud.value.ServiceConnection }}
177-
SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
178-
- ${{ else }}:
179-
- ${{ each cloud in parameters.CloudConfig }}:
180-
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}:
181-
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
182-
- stage: ${{ cloud.key }}_${{ parameters.JobName }}
183-
dependsOn: []
184-
jobs:
185-
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
186-
parameters:
187-
SparseCheckoutPaths:
188-
- sdk/${{ parameters.ServiceDirectory }}/**/*.json
189-
JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
190-
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
191-
Pool: azsdk-pool-mms-ubuntu-2004-general
192-
AdditionalParameters:
193-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
194-
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
195-
PreSteps:
196-
- ${{ parameters.PlatformPreSteps }}
197-
- ${{ parameters.PreSteps }}
198-
PostSteps:
199-
- ${{ parameters.PlatformPostSteps }}
200-
- ${{ parameters.PostSteps }}
201-
EnvVars: ${{ parameters.EnvVars }}
202-
MaxParallel: ${{ parameters.MaxParallel }}
203-
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
204-
AfterTestSteps: ${{ parameters.AfterTestSteps }}
205-
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
206-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
207-
TestMarkArgument: ${{ parameters.TestMarkArgument }}
208-
InjectedPackages: ${{ parameters.InjectedPackages }}
209-
BuildDocs: ${{ parameters.BuildDocs }}
210-
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
211-
TestProxy: ${{ parameters.TestProxy }}
212-
ToxTestEnv: ${{ parameters.ToxTestEnv }}
213-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
214-
MatrixConfigs:
215-
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
216-
- ${{ each config in parameters.MatrixConfigs }}:
217-
- ${{ config }}
218-
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
219-
- ${{ config }}
220-
MatrixFilters:
221-
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
222-
- ${{ cloudFilter }}
223-
- ${{ parameters.MatrixFilters }}
224-
MatrixReplace:
225-
- ${{ each cloudReplace in cloud.value.MatrixReplace }}:
226-
- ${{ cloudReplace }}
227-
- ${{ parameters.MatrixReplace }}
228-
CloudConfig:
229-
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
230-
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
231-
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
232-
Cloud: ${{ cloud.key }}
233-
ServiceConnection: ${{ cloud.value.ServiceConnection }}
234-
SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
105+
- ${{ each package in coalesce(parameters.Packages, split(parameters.BuildTargetingString, '|')) }}:
106+
- ${{ each cloud in parameters.CloudConfig }}:
107+
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}:
108+
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
109+
- stage:
110+
displayName: ${{ format('{0} {1} {2}', cloud.key, parameters.JobName, package) }}
111+
dependsOn: []
112+
jobs:
113+
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
114+
parameters:
115+
SparseCheckoutPaths:
116+
- sdk/${{ parameters.ServiceDirectory }}/**/*.json
117+
JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
118+
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
119+
Pool: azsdk-pool-mms-ubuntu-2004-general
120+
AdditionalParameters:
121+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
122+
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
123+
PreSteps:
124+
- ${{ parameters.PlatformPreSteps }}
125+
- ${{ parameters.PreSteps }}
126+
PostSteps:
127+
- ${{ parameters.PlatformPostSteps }}
128+
- ${{ parameters.PostSteps }}
129+
EnvVars: ${{ parameters.EnvVars }}
130+
MaxParallel: ${{ parameters.MaxParallel }}
131+
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
132+
AfterTestSteps: ${{ parameters.AfterTestSteps }}
133+
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
134+
BuildTargetingString: ${{ package }}
135+
TestMarkArgument: ${{ parameters.TestMarkArgument }}
136+
InjectedPackages: ${{ parameters.InjectedPackages }}
137+
BuildDocs: ${{ parameters.BuildDocs }}
138+
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
139+
TestProxy: ${{ parameters.TestProxy }}
140+
ToxTestEnv: ${{ parameters.ToxTestEnv }}
141+
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
142+
MatrixConfigs:
143+
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
144+
- ${{ each config in parameters.MatrixConfigs }}:
145+
- ${{ config }}
146+
- ${{ each config in parameters.AdditionalMatrixConfigs }}:
147+
- ${{ config }}
148+
MatrixFilters:
149+
- ${{ each cloudFilter in cloud.value.MatrixFilters }}:
150+
- ${{ cloudFilter }}
151+
- ${{ parameters.MatrixFilters }}
152+
MatrixReplace:
153+
- ${{ each cloudReplace in cloud.value.MatrixReplace }}:
154+
- ${{ cloudReplace }}
155+
- ${{ parameters.MatrixReplace }}
156+
CloudConfig:
157+
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
158+
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
159+
Location: ${{ coalesce(cloud.value.Location, parameters.Location) }}
160+
Cloud: ${{ cloud.key }}
161+
ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }}
162+
SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
163+
235164
- template: /eng/pipelines/templates/stages/python-analyze-weekly.yml
236165
parameters:
237166
BuildTargetingString: ${{ parameters.BuildTargetingString }}

‎sdk/agrifood/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ extends:
88
Clouds: Public_FarmBeats
99
CloudConfig:
1010
Public_Farmbeats:
11+
ServiceConnection: azure-sdk-tests-public #Might need a specific service connection if this is a unique sub.
1112
SubscriptionConfiguration: $(sub-config-farmbeats-azure-cloud-test-resources)
1213
EnvVars:
1314
AZURE_CLIENT_ID: $(AGRIFOOD_CLIENT_ID)

‎sdk/appconfiguration/tests.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,16 @@ parameters:
88
- azure-appconfiguration-provider
99

1010
extends:
11-
template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
11+
template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
1212
parameters:
1313
ServiceDirectory: appconfiguration
1414
Packages: ${{ parameters.Services }}
1515
SupportedClouds: 'Public,UsGov,China'
1616
TestTimeoutInMinutes: 240
17-
UseFederatedAuth: true
1817
CloudConfig:
1918
Public:
20-
ServiceConnection: azure-sdk-tests
21-
SubscriptionConfigurationFilePaths:
22-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
2319
UsGov:
24-
ServiceConnection: usgov_azure-sdk-tests
25-
SubscriptionConfigurationFilePaths:
26-
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
2720
China:
28-
ServiceConnection: china_azure-sdk-tests
29-
SubscriptionConfigurationFilePaths:
30-
- eng/common/TestResources/sub-config/AzureChinaMsft.json
3121
Location: chinanorth3
3222
MatrixReplace:
3323
- TestSamples=.*/true

0 commit comments

Comments
 (0)