Skip to content

Commit eee664e

Browse files
authored
Support multiple subscription configuration options (Azure#20796)
1 parent 22f57af commit eee664e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,27 @@ jobs:
4848
AgentImage: $(OSVmImage)
4949

5050
- ${{ if ne(parameters.DisableAzureResourceCreation, 'true') }}:
51+
- template: /eng/common/TestResources/build-test-resource-config.yml
52+
parameters:
53+
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
54+
SubscriptionConfigurations: ${{ parameters.CloudConfig.SubscriptionConfigurations }}
55+
5156
- ${{ if parameters.TestResourceDirectories }}:
5257
- ${{ each directory in parameters.TestResourceDirectories }}:
5358
- template: /eng/common/TestResources/deploy-test-resources.yml
5459
parameters:
5560
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
5661
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
5762
ServiceDirectory: '${{ directory }}'
58-
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
63+
SubscriptionConfiguration: $(SubscriptionConfiguration)
5964
ArmTemplateParameters: $(ArmTemplateParameters)
6065
- ${{ if not(parameters.TestResourceDirectories) }}:
6166
- template: /eng/common/TestResources/deploy-test-resources.yml
6267
parameters:
6368
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
6469
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
6570
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
66-
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
71+
SubscriptionConfiguration: $(SubscriptionConfiguration)
6772
ArmTemplateParameters: $(ArmTemplateParameters)
6873

6974
- ${{ parameters.PreSteps }}
@@ -123,7 +128,7 @@ jobs:
123128
- template: /eng/common/TestResources/remove-test-resources.yml
124129
parameters:
125130
ServiceDirectory: '${{ directory }}'
126-
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
131+
SubscriptionConfiguration: $(SubscriptionConfiguration)
127132
- ${{ if not(parameters.TestResourceDirectories) }}:
128133
- template: /eng/common/TestResources/remove-test-resources.yml
129134
parameters:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,6 @@ stages:
156156
- ${{ parameters.MatrixReplace }}
157157
CloudConfig:
158158
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
159+
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
159160
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
160161
Cloud: ${{ cloud.key }}

0 commit comments

Comments
 (0)