Skip to content
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

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

Merged
merged 1 commit into from
Aug 28, 2024
Merged

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

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
13 changes: 8 additions & 5 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 @@ -60,23 +60,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:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Canary:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'centraluseuap'
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
1 change: 0 additions & 1 deletion sdk/documentintelligence/tests.native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ extends:
safeName: azureaidocumentintelligence
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Expand Down
11 changes: 5 additions & 6 deletions sdk/documentintelligence/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ extends:
groupId: com.azure
safeName: azureaidocumentintelligence
CloudConfig:
CanaryPreview:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
ServiceConnection: azure-sdk-tests
Preview:
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Location: 'eastus'
Clouds: 'CanaryPreview'
SupportedClouds: 'CanaryPreview'
Clouds: 'Preview'
SupportedClouds: 'Preview'
6 changes: 3 additions & 3 deletions sdk/formrecognizer/tests.native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extends:
safeName: azureaiformrecognizer
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Location: 'eastus'
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'eastus'
SupportedClouds: 'Public'
6 changes: 3 additions & 3 deletions sdk/formrecognizer/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extends:
safeName: azureaiformrecognizer
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Location: 'centraluseuap'
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'centraluseuap'
SupportedClouds: 'Public'
17 changes: 12 additions & 5 deletions sdk/keyvault/tests-jca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,29 @@ extends:
AZURE_LOG_LEVEL: 2
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)
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
MatrixFilters:
- ArmTemplateParameters=^(?!.*enableHsm.*true)
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
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 Down
12 changes: 7 additions & 5 deletions sdk/keyvault/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,26 @@ extends:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}:
MatrixFilters:
- ArmTemplateParameters=^(?!.*enableHsm.*true)
UsGov:
SubscriptionConfiguration: $(sub-config-gov-test-resources)
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
MatrixFilters:
- ArmTemplateParameters=^(?!.*enableHsm.*true)
China:
SubscriptionConfiguration: $(sub-config-cn-test-resources)
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
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 Down
9 changes: 6 additions & 3 deletions sdk/search/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@ extends:
TimeoutInMinutes: 60
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: eastus
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
EnvVars:
AZURE_SEARCH_TEST_MODE: Live
Artifacts:
Expand Down
1 change: 0 additions & 1 deletion sdk/servicebus/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extends:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
EnvVars:
AZURE_LOG_LEVEL: 1
AdditionalMatrixConfigs:
Expand Down
7 changes: 4 additions & 3 deletions sdk/spring/pipeline/tests-supported-spring-versions-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,17 @@ stages:
Clouds: "Public"
CloudConfig:
Public:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
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
Location: "chinanorth3"
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
Artifacts: ${{ parameters.Artifacts }}
Expand Down
3 changes: 2 additions & 1 deletion sdk/storage/tests-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ stages:
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
Loading