Skip to content

Commit 1c9d5fe

Browse files
weshaggardweshaggard
authored
Switch to TME test subscription (Azure#46452)
1 parent f754c0b commit 1c9d5fe

File tree

30 files changed

+41
-267
lines changed

30 files changed

+41
-267
lines changed

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,12 @@ jobs:
132132
displayName: Set TestResources Location
133133
134134
- ${{ if parameters.DeployTestResources }}:
135-
- ${{ if parameters.TestResourceDirectories }}:
136-
- ${{ each directory in parameters.TestResourceDirectories }}:
137-
- template: /eng/common/TestResources/deploy-test-resources.yml
138-
parameters:
139-
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
140-
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
141-
ServiceDirectory: '${{ directory }}'
142-
TestResourcesDirectory: '$(TestResourcesDirectory)'
143-
SubscriptionConfiguration: $(SubscriptionConfiguration)
144-
ArmTemplateParameters: $(ArmTemplateParameters)
145-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
146-
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
147-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
148-
EnvVars:
149-
Pool: $(Pool)
150-
${{ insert }}: ${{ parameters.EnvVars }}
151-
- ${{ if not(parameters.TestResourceDirectories) }}:
135+
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
152136
- template: /eng/common/TestResources/deploy-test-resources.yml
153137
parameters:
154138
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
155139
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
156-
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
140+
ServiceDirectory: '${{ directory }}'
157141
TestResourcesDirectory: '$(TestResourcesDirectory)'
158142
SubscriptionConfiguration: $(SubscriptionConfiguration)
159143
ArmTemplateParameters: $(ArmTemplateParameters)
@@ -242,20 +226,10 @@ jobs:
242226
${{ var.key }}: ${{ var.value }}
243227
244228
- ${{ if parameters.DeployTestResources }}:
245-
- ${{ if parameters.TestResourceDirectories }}:
246-
- ${{ each directory in parameters.TestResourceDirectories }}:
247-
- template: /eng/common/TestResources/remove-test-resources.yml
248-
parameters:
249-
ServiceDirectory: '${{ directory }}'
250-
SubscriptionConfiguration: $(SubscriptionConfiguration)
251-
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
252-
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
253-
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
254-
255-
- ${{ if not(parameters.TestResourceDirectories) }}:
229+
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
256230
- template: /eng/common/TestResources/remove-test-resources.yml
257231
parameters:
258-
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
232+
ServiceDirectory: '${{ directory }}'
259233
SubscriptionConfiguration: $(SubscriptionConfiguration)
260234
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
261235
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}

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

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,11 @@ parameters:
5454
type: object
5555
default:
5656
Public:
57-
ServiceConnection: azure-sdk-tests
58-
SubscriptionConfigurationFilePaths:
59-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
60-
Preview:
61-
ServiceConnection: azure-sdk-tests-preview
62-
SubscriptionConfigurationFilePaths:
63-
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
64-
Canary:
65-
ServiceConnection: azure-sdk-tests
66-
SubscriptionConfigurationFilePaths:
67-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
68-
Location: 'eastus2euap'
57+
# Canary regions are currently not supported in TME so disabling for now
58+
# Canary:
59+
# Location: 'eastus2euap'
6960
UsGov:
70-
ServiceConnection: usgov_azure-sdk-tests
71-
SubscriptionConfigurationFilePaths:
72-
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
7361
China:
74-
ServiceConnection: china_azure-sdk-tests
75-
SubscriptionConfigurationFilePaths:
76-
- eng/common/TestResources/sub-config/AzureChinaMsft.json
7762
- name: MatrixConfigs
7863
type: object
7964
default:
@@ -122,7 +107,6 @@ parameters:
122107
extends:
123108
template: /eng/pipelines/templates/stages/1es-redirect.yml
124109
parameters:
125-
UseOfficial: false
126110
oneESTemplateTag: ${{ parameters.oneESTemplateTag }}
127111
stages:
128112
- ${{ each cloud in parameters.CloudConfig }}:
@@ -175,8 +159,8 @@ extends:
175159
- ${{ parameters.MatrixReplace }}
176160
CloudConfig:
177161
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
178-
ServiceConnection: ${{ cloud.value.ServiceConnection }}
162+
ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }}
179163
SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
180164
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
181-
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
165+
Location: ${{ coalesce(cloud.value.Location, parameters.Location) }}
182166
Cloud: ${{ cloud.key }}

‎sdk/appconfiguration/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ extends:
44
template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
55
parameters:
66
ServiceDirectory: appconfiguration
7-
SupportedClouds: 'Public,Preview,UsGov'
7+
SupportedClouds: 'Public,UsGov'

‎sdk/communication/Azure.Communication.AlphaIds/tests.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@ extends:
88
CloudConfig:
99
Public:
1010
SubscriptionConfigurations:
11-
- $(sub-config-azure-cloud-test-resources)
1211
- $(sub-config-communication-services-cloud-test-resources-common)
1312
- $(sub-config-communication-services-cloud-test-resources-net)
14-
Int:
15-
SubscriptionConfigurations:
16-
- $(sub-config-communication-int-test-resources-common)
17-
- $(sub-config-communication-int-test-resources-net)
18-
Clouds: Public,Int
1913
TestResourceDirectories:
2014
- communication/test-resources/

‎sdk/communication/Azure.Communication.CallAutomation/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ extends:
77
Project: Azure.Communication.CallAutomation
88
CloudConfig:
99
Public:
10-
ServiceConnection: azure-sdk-tests
11-
SubscriptionConfigurationFilePaths:
12-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1310
SubscriptionConfigurations:
1411
- $(sub-config-communication-services-cloud-test-resources-common)
1512
- $(sub-config-communication-services-cloud-test-resources-net)
16-
Clouds: Public
1713
TestResourceDirectories:
1814
- communication/
1915
EnvVars:

‎sdk/communication/Azure.Communication.CallingServer/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ extends:
77
Project: Azure.Communication.CallingServer
88
CloudConfig:
99
Public:
10-
ServiceConnection: azure-sdk-tests
11-
SubscriptionConfigurationFilePaths:
12-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1310
SubscriptionConfigurations:
1411
- $(sub-config-communication-services-cloud-test-resources-common)
1512
- $(sub-config-communication-services-cloud-test-resources-net)
16-
Clouds: Public
1713
TestResourceDirectories:
1814
- communication/
1915
EnvVars:

‎sdk/communication/Azure.Communication.Chat/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ extends:
77
Project: Azure.Communication.Chat
88
CloudConfig:
99
Public:
10-
ServiceConnection: azure-sdk-tests
11-
SubscriptionConfigurationFilePaths:
12-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1310
SubscriptionConfigurations:
1411
- $(sub-config-communication-services-cloud-test-resources-common)
1512
- $(sub-config-communication-services-cloud-test-resources-net)
16-
Clouds: Public
1713
TestResourceDirectories:
1814
- communication/

‎sdk/communication/Azure.Communication.Email/tests.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
trigger: none
22

3-
parameters:
4-
- name: runOnlyPPE
5-
displayName: "Run only the PPE stage"
6-
type: boolean
7-
default: false
8-
93
extends:
104
template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
115
parameters:
@@ -14,20 +8,7 @@ extends:
148
CloudConfig:
159
Public:
1610
SubscriptionConfigurations:
17-
- $(sub-config-azure-cloud-test-resources)
1811
- $(sub-config-communication-services-cloud-test-resources-common)
1912
- $(sub-config-communication-services-cloud-test-resources-net)
20-
Int:
21-
SubscriptionConfigurations:
22-
- $(sub-config-communication-int-test-resources-common)
23-
- $(sub-config-communication-int-test-resources-net)
24-
PPE:
25-
SubscriptionConfigurations:
26-
- $(sub-config-communication-ppe-test-resources-common)
27-
- $(sub-config-communication-ppe-test-resources-net)
28-
${{ if eq(parameters.runOnlyPPE, true) }}:
29-
Clouds: PPE
30-
${{ if eq(parameters.runOnlyPPE, false) }}:
31-
Clouds: Public,PPE,Int
3213
TestResourceDirectories:
3314
- communication/Azure.Communication.Email/

‎sdk/communication/Azure.Communication.Identity/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ extends:
77
Project: Azure.Communication.Identity
88
CloudConfig:
99
Public:
10-
ServiceConnection: azure-sdk-tests
11-
SubscriptionConfigurationFilePaths:
12-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1310
SubscriptionConfigurations:
1411
- $(sub-config-communication-services-cloud-test-resources-common)
1512
- $(sub-config-communication-services-cloud-test-resources-net)
16-
Clouds: Public
1713
TestResourceDirectories:
1814
- communication/

‎sdk/communication/Azure.Communication.JobRouter/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ extends:
77
Project: Azure.Communication.JobRouter
88
CloudConfig:
99
Public:
10-
ServiceConnection: azure-sdk-tests
11-
SubscriptionConfigurationFilePaths:
12-
- eng/common/TestResources/sub-config/AzurePublicMsft.json
1310
SubscriptionConfigurations:
1411
- $(sub-config-communication-services-cloud-test-resources-common)
1512
- $(sub-config-communication-services-cloud-test-resources-net)
16-
Clouds: Public
1713
TestResourceDirectories:
1814
- communication/

0 commit comments

Comments
 (0)