Skip to content

Commit d3e63e7

Browse files
authored
Support multiple subscription configuration options (Azure#20508)
1 parent 3450eef commit d3e63e7

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,17 @@ jobs:
8484
- ${{ each pair in step }}:
8585
${{ pair.key }}: ${{ pair.value }}
8686

87+
- template: /eng/common/TestResources/build-test-resource-config.yml
88+
parameters:
89+
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
90+
SubscriptionConfigurations: ${{ parameters.CloudConfig.SubscriptionConfigurations }}
91+
8792
- template: /eng/common/TestResources/deploy-test-resources.yml
8893
parameters:
8994
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
9095
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
9196
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
92-
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
97+
SubscriptionConfiguration: $(SubscriptionConfiguration)
9398
ArmTemplateParameters: $(ArmTemplateParameters)
9499

95100
- pwsh: |
@@ -122,7 +127,7 @@ jobs:
122127
- template: /eng/common/TestResources/remove-test-resources.yml
123128
parameters:
124129
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
125-
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
130+
SubscriptionConfiguration: $(SubscriptionConfiguration)
126131

127132
- task: PublishTestResults@2
128133
condition: always()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,6 @@ stages:
141141
- ${{ parameters.MatrixReplace }}
142142
CloudConfig:
143143
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
144+
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
144145
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
145146
Cloud: ${{ cloud.key }}

0 commit comments

Comments
 (0)