diff --git a/eng/pipelines/templates/stages/archetype-sdk-native-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-native-tests.yml index 2cd448f1690c..a3e36033b1f4 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-native-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-native-tests.yml @@ -67,8 +67,6 @@ parameters: # Canary regions are currently not supported in TME so disabling for now # Canary: # Location: 'centraluseuap' - UsGov: - China: - name: MatrixConfigs type: object default: diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml b/eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml index adbdf15d0c70..4d60e7d946b5 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml @@ -73,8 +73,6 @@ parameters: # Canary regions are currently not supported in TME so disabling for now # Canary: # Location: 'centraluseuap' - UsGov: - China: - name: MatrixConfigs type: object default: diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml index d15c39c033ae..917d1e0200b7 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml @@ -64,8 +64,6 @@ parameters: # Canary regions are currently not supported in TME so disabling for now # Canary: # Location: 'centraluseuap' - UsGov: - China: - name: MatrixConfigs type: object default: diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index 86f5ecd94fd5..17c68f58d315 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -9,4 +9,3 @@ extends: groupId: com.azure safeName: azuredataappconfiguration TimeoutInMinutes: 90 - SupportedClouds: "Public,UsGov,China" diff --git a/sdk/containerregistry/tests.yml b/sdk/containerregistry/tests.yml index 1839125cf124..55d77beabb49 100644 --- a/sdk/containerregistry/tests.yml +++ b/sdk/containerregistry/tests.yml @@ -4,7 +4,6 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: containerregistry - SupportedClouds: 'Public,UsGov,China' Artifacts: - name: azure-containers-containerregistry groupId: com.azure diff --git a/sdk/eventhubs/tests.yml b/sdk/eventhubs/tests.yml index 528a7e0ec929..c3f0e580c03f 100644 --- a/sdk/eventhubs/tests.yml +++ b/sdk/eventhubs/tests.yml @@ -31,7 +31,6 @@ extends: groupId: com.azure safeName: azuremessagingeventhubscheckpointstorejedis TimeoutInMinutes: 120 - SupportedClouds: 'Public,UsGov,China' EnvVars: AZURE_LOG_LEVEL: 1 AdditionalMatrixConfigs: diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml index 27e3ef546a15..ff571e869cce 100644 --- a/sdk/identity/ci.yml +++ b/sdk/identity/ci.yml @@ -90,7 +90,6 @@ extends: Location: 'westus2' CalledFromClient: true ServiceDirectory: identity - SupportedClouds: 'Public,UsGov,China' EnvVars: AZ_OIDC_TOKEN: $(ARM_OIDC_TOKEN) AZURE_IDENTITY_MULTI_TENANT_CLIENT_SECRET: $(AZURE-IDENTITY-MULTI-TENANT-CLIENT-SECRET) diff --git a/sdk/keyvault/tests-jca.yml b/sdk/keyvault/tests-jca.yml index dc6e2182e55d..9267e1e5c0b9 100644 --- a/sdk/keyvault/tests-jca.yml +++ b/sdk/keyvault/tests-jca.yml @@ -7,7 +7,6 @@ extends: TestResourceDirectories: - keyvault/test-resources-jca TimeoutInMinutes: 240 - SupportedClouds: 'Public,UsGov,China' EnvVars: AZURE_LOG_LEVEL: 2 CloudConfig: @@ -15,12 +14,6 @@ extends: ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}: MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) - UsGov: - MatrixFilters: - - ArmTemplateParameters=^(?!.*enableHsm.*true) - China: - MatrixFilters: - - ArmTemplateParameters=^(?!.*enableHsm.*true) MatrixConfigs: - Name: Key_Vault_live_test Path: sdk/keyvault/platform-matrix.json diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml index 27df8a2a01ea..d6acaa030483 100644 --- a/sdk/keyvault/tests.yml +++ b/sdk/keyvault/tests.yml @@ -7,7 +7,6 @@ extends: TestResourceDirectories: - keyvault/test-resources TimeoutInMinutes: 240 - SupportedClouds: 'Public,UsGov,China' EnvVars: AZURE_LOG_LEVEL: 2 CloudConfig: @@ -15,12 +14,6 @@ extends: ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}: MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) - UsGov: - MatrixFilters: - - ArmTemplateParameters=^(?!.*enableHsm.*true) - China: - MatrixFilters: - - ArmTemplateParameters=^(?!.*enableHsm.*true) MatrixConfigs: - Name: Key_Vault_live_test Path: sdk/keyvault/platform-matrix.json diff --git a/sdk/monitor/tests.yml b/sdk/monitor/tests.yml index f76ec673bf10..4a57b6d94f71 100644 --- a/sdk/monitor/tests.yml +++ b/sdk/monitor/tests.yml @@ -4,7 +4,6 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: monitor - SupportedClouds: 'Public,UsGov,China' Artifacts: - name: azure-monitor-ingestion groupId: com.azure diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml index 4aa4200ec4fa..4483ec9ad822 100644 --- a/sdk/search/tests.yml +++ b/sdk/search/tests.yml @@ -4,7 +4,6 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: search - SupportedClouds: 'Public,UsGov,China' TimeoutInMinutes: 60 EnvVars: AZURE_SEARCH_TEST_MODE: Live diff --git a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml index 04b1806c3c32..4578041b21e9 100644 --- a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml +++ b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml @@ -39,7 +39,6 @@ parameters: stages: - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml parameters: - SupportedClouds: "Public,UsGov,China" TestResourceDirectories: ${{ parameters.TestResourceDirectories }} Artifacts: ${{ parameters.Artifacts }} TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }} diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml index c516d87b3ec1..71bff06b0caf 100644 --- a/sdk/textanalytics/tests.yml +++ b/sdk/textanalytics/tests.yml @@ -5,7 +5,6 @@ extends: parameters: ServiceDirectory: textanalytics Location: eastus - SupportedClouds: 'Public,UsGov,China' UseFederatedAuth: false Artifacts: - name: azure-ai-textanalytics diff --git a/sdk/webpubsub/tests.yml b/sdk/webpubsub/tests.yml index a63b84cbe172..75019e939c93 100644 --- a/sdk/webpubsub/tests.yml +++ b/sdk/webpubsub/tests.yml @@ -12,7 +12,6 @@ extends: groupId: com.azure safeName: azuremessagingwebpubsubclient TimeoutInMinutes: 60 - SupportedClouds: 'Public,UsGov,China' EnvVars: AZURE_LOG_LEVEL: 2 AZURE_SUBSCRIPTION_ID: $(WEBPUBSUB_SUBSCRIPTION_ID)