Skip to content

Default to sub config file paths/svc connection for public + sovereign live tests #45161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benbp merged 1 commit into from
Oct 2, 2024
Merged

Default to sub config file paths/svc connection for public + sovereign live tests #45161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,26 @@ parameters:
type: object
default:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
Comment thread
benbp marked this conversation as resolved.
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Canary:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Location: 'eastus2euap'
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'eastus2euap'
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
- name: MatrixConfigs
type: object
default:
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/Azure.Communication.CallAutomation/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extends:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/Azure.Communication.CallingServer/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extends:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/Azure.Communication.Email/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ extends:
${{ if eq(parameters.runOnlyPPE, false) }}:
Clouds: Public,PPE,Int
TestResourceDirectories:
- communication/Azure.Communication.Email/
- communication/Azure.Communication.Email/
4 changes: 3 additions & 1 deletion sdk/digitaltwins/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ extends:
ServiceDirectory: digitaltwins
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: westcentralus
Clouds: Public
4 changes: 3 additions & 1 deletion sdk/documentintelligence/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ extends:
ServiceDirectory: documentintelligence
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'eastus'
SupportedClouds: 'Public'
4 changes: 3 additions & 1 deletion sdk/extension-wcf/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ extends:
Location: canadacentral
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
PrivatePreview:
SubscriptionConfiguration: $(sub-config-storage-test-resources)
Clouds: Preview
Expand Down
8 changes: 6 additions & 2 deletions sdk/formrecognizer/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ extends:
TimeoutInMinutes: 180
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: '${{ parameters.Location }}'
Canary:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'centraluseuap'
Clouds: 'Public'
SupportedClouds: 'Public, Canary'
11 changes: 7 additions & 4 deletions sdk/keyvault/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ extends:
SupportedClouds: 'Public,UsGov,Canary'
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}:
MatrixFilters:
- ArmTemplateParameters=^(?!.*enableHsm.*true)
Canary:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Location: 'centraluseuap'
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'centraluseuap'
# Managed HSM test resources are expensive and provisioning has not been reliable.
# Given test coverage of non-canary regions we probably don't need to test in canary.
MatrixFilters:
Expand All @@ -28,8 +30,9 @@ extends:
MatrixReplace:
- 'ArmTemplateParameters=(.*)enableAttestation.*?\$true(.*)/$1enableAttestation \= $false$2'
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
MatrixFilters:
- ArmTemplateParameters=^(?!.*enableHsm.*true)
MatrixConfigs:
Expand Down
7 changes: 0 additions & 7 deletions sdk/monitor/Azure.Monitor.Ingestion/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,5 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
parameters:
ServiceDirectory: monitor
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
SupportedClouds: 'Public,UsGov,China'
Project: Azure.Monitor.Ingestion
8 changes: 6 additions & 2 deletions sdk/search/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ extends:
SupportedClouds: 'Preview,UsGov'
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Location: 'westus'
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
EnvVars:
AZURE_SEARCH_TEST_MODE: Live
4 changes: 3 additions & 1 deletion sdk/storage/tests.datamovement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ extends:
Location: canadacentral
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
PrivatePreview:
SubscriptionConfiguration: $(sub-config-storage-test-resources)
Clouds: Preview
Expand Down
4 changes: 3 additions & 1 deletion sdk/storage/tests.functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ extends:
Location: canadacentral
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
PrivatePreview:
SubscriptionConfiguration: $(sub-config-storage-test-resources)
Clouds: Preview
Expand Down
4 changes: 3 additions & 1 deletion sdk/storage/tests.mgmt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ extends:
Location: canadacentral
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
PrivatePreview:
SubscriptionConfiguration: $(sub-config-storage-test-resources)
Clouds: Preview
Expand Down
3 changes: 2 additions & 1 deletion sdk/storage/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ extends:
Location: canadacentral
CloudConfig:
Preview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
PrivatePreview:
SubscriptionConfiguration: $(sub-config-storage-test-resources)
Clouds: Preview
Expand Down
12 changes: 9 additions & 3 deletions sdk/textanalytics/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,18 @@ extends:
ServiceDirectory: textanalytics
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: '${{ parameters.Location }}'
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
SupportedClouds: 'Public,UsGov,China'
# temporary env vars for custom text features
EnvVars:
Expand Down
⚡