Skip to content

Commit b82bf25

Browse files
scbedddanieljurek
andauthored
Fix Failing Merge Subscription Configuration step (#36250)
* Only use sub config file paths when using federated auth * parameters * SubscriptionFilePath -> SubscriptionFilePaths --------- Co-authored-by: Daniel Jurek <[email protected]>
1 parent ba2e30e commit b82bf25

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ jobs:
117117
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
118118
SubscriptionConfigurations: ${{ parameters.CloudConfig.SubscriptionConfigurations }}
119119
EnvVars: ${{ parameters.EnvVars }}
120-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
120+
${{ if parameters.UseFederatedAuth }}:
121+
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
121122

122123
- ${{ if parameters.TestResourceDirectories }}:
123124
- ${{ each directory in parameters.TestResourceDirectories }}:

sdk/appconfiguration/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ extends:
1919
Public:
2020
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
2121
ServiceConnection: azure-sdk-tests
22-
SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
22+
SubscriptionConfigurationFilePaths:
23+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
2324

2425
UsGov:
2526
SubscriptionConfiguration: $(sub-config-gov-test-resources)

0 commit comments

Comments
 (0)