Skip to content

Commit 54ec2a7

Browse files
benbpbenbp
authored
Default to sub config file paths/svc connection for public + sovereign live tests (#36609)
1 parent c20cdc5 commit 54ec2a7

File tree

19 files changed

+111
-70
lines changed

19 files changed

+111
-70
lines changed

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,26 @@ parameters:
5757
type: object
5858
default:
5959
Public:
60-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
6160
ServiceConnection: azure-sdk-tests
6261
SubscriptionConfigurationFilePaths:
6362
- eng/common/TestResources/sub-config/AzurePublicMsft.json
6463
Preview:
65-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
6664
ServiceConnection: azure-sdk-tests-preview
65+
SubscriptionConfigurationFilePaths:
66+
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
6767
Canary:
68-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
68+
ServiceConnection: azure-sdk-tests
69+
SubscriptionConfigurationFilePaths:
70+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
6971
Location: 'centraluseuap'
7072
UsGov:
71-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
73+
ServiceConnection: usgov_azure-sdk-tests
74+
SubscriptionConfigurationFilePaths:
75+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
7276
China:
73-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
77+
ServiceConnection: china_azure-sdk-tests
78+
SubscriptionConfigurationFilePaths:
79+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
7480
- name: MatrixConfigs
7581
type: object
7682
default:

‎sdk/appconfiguration/tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ extends:
1717
UseFederatedAuth: true
1818
CloudConfig:
1919
Public:
20-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
2120
ServiceConnection: azure-sdk-tests
22-
SubscriptionConfigurationFilePaths:
21+
SubscriptionConfigurationFilePaths:
2322
- eng/common/TestResources/sub-config/AzurePublicMsft.json
24-
2523
UsGov:
26-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
24+
ServiceConnection: usgov_azure-sdk-tests
25+
SubscriptionConfigurationFilePaths:
26+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
2727
China:
28-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
28+
ServiceConnection: china_azure-sdk-tests
29+
SubscriptionConfigurationFilePaths:
30+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
2931
Location: chinanorth3
3032
MatrixReplace:
3133
- TestSamples=.*/true

‎sdk/communication/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ extends:
4040
SubscriptionConfigurations:
4141
- $(sub-config-communication-int-test-resources-common)
4242
- $(sub-config-communication-int-test-resources-python)
43-
Clouds: Public,Int
43+
Clouds: Public,Int

‎sdk/containerregistry/tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ extends:
1010
UseFederatedAuth: true
1111
CloudConfig:
1212
Public:
13-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
1413
ServiceConnection: azure-sdk-tests
15-
SubscriptionConfigurationFilePaths:
14+
SubscriptionConfigurationFilePaths:
1615
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1716
UsGov:
18-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
17+
ServiceConnection: usgov_azure-sdk-tests
18+
SubscriptionConfigurationFilePaths:
19+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
1920
China:
20-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
21+
ServiceConnection: china_azure-sdk-tests
22+
SubscriptionConfigurationFilePaths:
23+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
2124
Location: chinanorth3
2225
MatrixReplace:
2326
- TestSamples=.*/true

‎sdk/documentintelligence/tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ extends:
1515
# As such, the canary test runs should run on a reduced matrix.
1616
CloudConfig:
1717
Prod:
18-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
18+
ServiceConnection: azure-sdk-tests-preview
19+
SubscriptionConfigurationFilePaths:
20+
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
1921
Location: eastus
20-
ServiceConnection: azure-sdk-tests
21-
SubscriptionConfigurationFilePaths:
22-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
2322
EnvVars:
2423
AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)
2524
TEST_MODE: 'RunLiveNoRecord'

‎sdk/eventhub/tests.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ extends:
1010
SupportedClouds: 'Public,UsGov,China'
1111
CloudConfig:
1212
Public:
13-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
1413
ServiceConnection: azure-sdk-tests
15-
SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
14+
SubscriptionConfigurationFilePaths:
15+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1616
UsGov:
17-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
18-
ServiceConnection: azure-sdk-tests
19-
China:
20-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
2117
ServiceConnection: usgov_azure-sdk-tests
18+
SubscriptionConfigurationFilePaths:
19+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
20+
China:
21+
ServiceConnection: china_azure-sdk-tests
22+
SubscriptionConfigurationFilePaths:
23+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
2224
Location: 'chinanorth3'
2325
MatrixReplace:
2426
- TestSamples=.*/true

‎sdk/formrecognizer/tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ extends:
1414
# As such, the canary test runs should run on a reduced matrix.
1515
CloudConfig:
1616
Prod:
17-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
17+
ServiceConnection: azure-sdk-tests
18+
SubscriptionConfigurationFilePaths:
19+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1820
Location: $(LOCATION)
1921
EnvVars:
2022
AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)

‎sdk/identity/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ extends:
3434
ServiceConnection: azure-sdk-tests
3535
SubscriptionConfigurationFilePaths:
3636
- eng/common/TestResources/sub-config/AzurePublicMsft.json
37-
UseFederatedAuth: true
3837
${{ if contains(variables['Build.DefinitionName'], 'tests-weekly') }}:
3938
# Test Managed Identity integrations tests on weekly tests pipeline.
4039
AdditionalMatrixConfigs:

‎sdk/keyvault/azure-keyvault-administration/tests.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,23 @@ extends:
88
JobName: azure_keyvault_administration
99
SupportedClouds: 'Public,UsGov,China'
1010
TestTimeoutInMinutes: 240
11-
TestResourceDirectories:
11+
TestResourceDirectories:
1212
- keyvault/
1313
CloudConfig:
1414
Public:
15-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
15+
ServiceConnection: azure-sdk-tests
16+
SubscriptionConfigurationFilePaths:
17+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1618
UsGov:
17-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
19+
ServiceConnection: usgov_azure-sdk-tests
20+
SubscriptionConfigurationFilePaths:
21+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
1822
MatrixFilters:
1923
- ArmTemplateParameters=^(?!.*enableHsm.*true)
2024
China:
21-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
25+
ServiceConnection: china_azure-sdk-tests
26+
SubscriptionConfigurationFilePaths:
27+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
2228
MatrixFilters:
2329
- ArmTemplateParameters=^(?!.*enableHsm.*true)
2430
Location: chinaeast2

‎sdk/keyvault/azure-keyvault-keys/tests.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,23 @@ extends:
88
JobName: azure_keyvault_keys
99
SupportedClouds: 'Public,UsGov,China'
1010
TestTimeoutInMinutes: 240
11-
TestResourceDirectories:
11+
TestResourceDirectories:
1212
- keyvault/
1313
CloudConfig:
1414
Public:
15-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
15+
ServiceConnection: azure-sdk-tests
16+
SubscriptionConfigurationFilePaths:
17+
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1618
UsGov:
17-
SubscriptionConfiguration: $(sub-config-gov-test-resources)
19+
ServiceConnection: usgov_azure-sdk-tests
20+
SubscriptionConfigurationFilePaths:
21+
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
1822
MatrixFilters:
1923
- ArmTemplateParameters=^(?!.*enableHsm.*true)
2024
China:
21-
SubscriptionConfiguration: $(sub-config-cn-test-resources)
25+
ServiceConnection: china_azure-sdk-tests
26+
SubscriptionConfigurationFilePaths:
27+
- eng/common/TestResources/sub-config/AzureChinaMsft.json
2228
MatrixFilters:
2329
- ArmTemplateParameters=^(?!.*enableHsm.*true)
2430
Location: chinaeast2

0 commit comments

Comments
 (0)