diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index 93236df72152..6c7c51383662 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -132,28 +132,12 @@ jobs: displayName: Set TestResources Location - ${{ if parameters.DeployTestResources }}: - - ${{ if parameters.TestResourceDirectories }}: - - ${{ each directory in parameters.TestResourceDirectories }}: - - template: /eng/common/TestResources/deploy-test-resources.yml - parameters: - ${{ if or(parameters.Location, parameters.CloudConfig.Location) }}: - Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }} - ServiceDirectory: '${{ directory }}' - TestResourcesDirectory: '$(TestResourcesDirectory)' - SubscriptionConfiguration: $(SubscriptionConfiguration) - ArmTemplateParameters: $(ArmTemplateParameters) - UseFederatedAuth: ${{ parameters.UseFederatedAuth }} - ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }} - EnvVars: - Pool: $(Pool) - ${{ insert }}: ${{ parameters.EnvVars }} - - ${{ if not(parameters.TestResourceDirectories) }}: + - ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}: - template: /eng/common/TestResources/deploy-test-resources.yml parameters: ${{ if or(parameters.Location, parameters.CloudConfig.Location) }}: Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }} - ServiceDirectory: '${{ parameters.ServiceDirectory }}' + ServiceDirectory: '${{ directory }}' TestResourcesDirectory: '$(TestResourcesDirectory)' SubscriptionConfiguration: $(SubscriptionConfiguration) ArmTemplateParameters: $(ArmTemplateParameters) @@ -242,20 +226,10 @@ jobs: ${{ var.key }}: ${{ var.value }} - ${{ if parameters.DeployTestResources }}: - - ${{ if parameters.TestResourceDirectories }}: - - ${{ each directory in parameters.TestResourceDirectories }}: - - template: /eng/common/TestResources/remove-test-resources.yml - parameters: - ServiceDirectory: '${{ directory }}' - SubscriptionConfiguration: $(SubscriptionConfiguration) - UseFederatedAuth: ${{ parameters.UseFederatedAuth }} - ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }} - - - ${{ if not(parameters.TestResourceDirectories) }}: + - ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}: - template: /eng/common/TestResources/remove-test-resources.yml parameters: - ServiceDirectory: '${{ parameters.ServiceDirectory }}' + ServiceDirectory: '${{ directory }}' SubscriptionConfiguration: $(SubscriptionConfiguration) UseFederatedAuth: ${{ parameters.UseFederatedAuth }} ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml index d694ed2ab118..61446b5e4025 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml @@ -54,26 +54,11 @@ parameters: type: object default: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json - Canary: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - Location: 'eastus2euap' + # Canary regions are currently not supported in TME so disabling for now + # Canary: + # Location: 'eastus2euap' UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json China: - ServiceConnection: china_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureChinaMsft.json - name: MatrixConfigs type: object default: @@ -122,7 +107,6 @@ parameters: extends: template: /eng/pipelines/templates/stages/1es-redirect.yml parameters: - UseOfficial: false oneESTemplateTag: ${{ parameters.oneESTemplateTag }} stages: - ${{ each cloud in parameters.CloudConfig }}: @@ -175,8 +159,8 @@ extends: - ${{ parameters.MatrixReplace }} CloudConfig: SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }} - ServiceConnection: ${{ cloud.value.ServiceConnection }} + ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }} SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }} SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }} - Location: ${{ coalesce(parameters.Location, cloud.value.Location) }} + Location: ${{ coalesce(cloud.value.Location, parameters.Location) }} Cloud: ${{ cloud.key }} diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index b4571868bfc8..e7f9903d7415 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -4,4 +4,4 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: appconfiguration - SupportedClouds: 'Public,Preview,UsGov' + SupportedClouds: 'Public,UsGov' diff --git a/sdk/communication/Azure.Communication.AlphaIds/tests.yml b/sdk/communication/Azure.Communication.AlphaIds/tests.yml index c674388c9271..b23d96e897b4 100644 --- a/sdk/communication/Azure.Communication.AlphaIds/tests.yml +++ b/sdk/communication/Azure.Communication.AlphaIds/tests.yml @@ -8,13 +8,7 @@ extends: CloudConfig: Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - Clouds: Public,Int TestResourceDirectories: - communication/test-resources/ diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests.yml b/sdk/communication/Azure.Communication.CallAutomation/tests.yml index 56b8eae6289f..6a6e51c48641 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/tests.yml +++ b/sdk/communication/Azure.Communication.CallAutomation/tests.yml @@ -7,13 +7,9 @@ extends: Project: Azure.Communication.CallAutomation CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ EnvVars: diff --git a/sdk/communication/Azure.Communication.CallingServer/tests.yml b/sdk/communication/Azure.Communication.CallingServer/tests.yml index a42203d94010..e4b65d82f80d 100644 --- a/sdk/communication/Azure.Communication.CallingServer/tests.yml +++ b/sdk/communication/Azure.Communication.CallingServer/tests.yml @@ -7,13 +7,9 @@ extends: Project: Azure.Communication.CallingServer CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ EnvVars: diff --git a/sdk/communication/Azure.Communication.Chat/tests.yml b/sdk/communication/Azure.Communication.Chat/tests.yml index 9a9b489ad946..e2d1bdc4a063 100644 --- a/sdk/communication/Azure.Communication.Chat/tests.yml +++ b/sdk/communication/Azure.Communication.Chat/tests.yml @@ -7,12 +7,8 @@ extends: Project: Azure.Communication.Chat CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Email/tests.yml b/sdk/communication/Azure.Communication.Email/tests.yml index 24286be95d28..cbdf7b96bcec 100644 --- a/sdk/communication/Azure.Communication.Email/tests.yml +++ b/sdk/communication/Azure.Communication.Email/tests.yml @@ -1,11 +1,5 @@ trigger: none -parameters: -- name: runOnlyPPE - displayName: "Run only the PPE stage" - type: boolean - default: false - extends: template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: @@ -14,20 +8,7 @@ extends: CloudConfig: Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-net) - ${{ if eq(parameters.runOnlyPPE, true) }}: - Clouds: PPE - ${{ if eq(parameters.runOnlyPPE, false) }}: - Clouds: Public,PPE,Int TestResourceDirectories: - communication/Azure.Communication.Email/ diff --git a/sdk/communication/Azure.Communication.Identity/tests.yml b/sdk/communication/Azure.Communication.Identity/tests.yml index 153528c8359c..21ac261f4ae8 100644 --- a/sdk/communication/Azure.Communication.Identity/tests.yml +++ b/sdk/communication/Azure.Communication.Identity/tests.yml @@ -7,12 +7,8 @@ extends: Project: Azure.Communication.Identity CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.JobRouter/tests.yml b/sdk/communication/Azure.Communication.JobRouter/tests.yml index f7ee7d6b6995..e331311725ca 100644 --- a/sdk/communication/Azure.Communication.JobRouter/tests.yml +++ b/sdk/communication/Azure.Communication.JobRouter/tests.yml @@ -7,12 +7,8 @@ extends: Project: Azure.Communication.JobRouter CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Messages/tests.yml b/sdk/communication/Azure.Communication.Messages/tests.yml index 56c818c046ec..ff1252d10735 100644 --- a/sdk/communication/Azure.Communication.Messages/tests.yml +++ b/sdk/communication/Azure.Communication.Messages/tests.yml @@ -6,9 +6,7 @@ extends: ServiceDirectory: communication Project: Azure.Communication.Messages CloudConfig: - Public: + PUblic: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public diff --git a/sdk/communication/Azure.Communication.PhoneNumbers/tests.yml b/sdk/communication/Azure.Communication.PhoneNumbers/tests.yml index f3751b546467..ebc9803aec28 100644 --- a/sdk/communication/Azure.Communication.PhoneNumbers/tests.yml +++ b/sdk/communication/Azure.Communication.PhoneNumbers/tests.yml @@ -13,23 +13,8 @@ extends: CloudConfig: Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-net) - MatrixReplace: - - SKIP_UPDATE_CAPABILITIES_LIVE_TESTS=FALSE/TRUE - - SKIP_SIPROUTING_LIVE_TESTS=FALSE/TRUE - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - MatrixReplace: - - SKIP_UPDATE_CAPABILITIES_LIVE_TESTS=FALSE/TRUE - Clouds: Public, PPE, Int TestResourceDirectories: - communication/test-resources/ EnvVars: diff --git a/sdk/communication/Azure.Communication.Rooms/tests.yml b/sdk/communication/Azure.Communication.Rooms/tests.yml index 07921c43446b..4c4199566f0f 100644 --- a/sdk/communication/Azure.Communication.Rooms/tests.yml +++ b/sdk/communication/Azure.Communication.Rooms/tests.yml @@ -7,12 +7,8 @@ extends: Project: Azure.Communication.Rooms CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.ShortCodes/tests.yml b/sdk/communication/Azure.Communication.ShortCodes/tests.yml index 3804837aea7d..f963b25bf5cc 100644 --- a/sdk/communication/Azure.Communication.ShortCodes/tests.yml +++ b/sdk/communication/Azure.Communication.ShortCodes/tests.yml @@ -7,12 +7,8 @@ extends: Project: Azure.Communication.ShortCodes CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Sms/tests.int.yml b/sdk/communication/Azure.Communication.Sms/tests.int.yml deleted file mode 100644 index 9d2bef961972..000000000000 --- a/sdk/communication/Azure.Communication.Sms/tests.int.yml +++ /dev/null @@ -1,16 +0,0 @@ -trigger: none - -extends: - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - ServiceDirectory: communication - Project: Azure.Communication.Sms - CloudConfig: - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - - $(sub-config-communication-sms-int-test-resources) - Clouds: Int - TestResourceDirectories: - - communication/ diff --git a/sdk/communication/Azure.Communication.Sms/tests.yml b/sdk/communication/Azure.Communication.Sms/tests.yml index a780be0adb4e..3be32808b6ab 100644 --- a/sdk/communication/Azure.Communication.Sms/tests.yml +++ b/sdk/communication/Azure.Communication.Sms/tests.yml @@ -7,14 +7,9 @@ extends: Project: Azure.Communication.Sms CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - $(sub-config-communication-services-sms-cloud-test-resources) - Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/devcenter/tests.yml b/sdk/devcenter/tests.yml index 3a81489b2c5f..27ea8595efc8 100644 --- a/sdk/devcenter/tests.yml +++ b/sdk/devcenter/tests.yml @@ -7,7 +7,8 @@ extends: SDKType: client DeployTestResources: true TimeoutInMinutes: 240 + UseFederatedAuth: false #This looks to be another sub so it will need a new service connection to run CloudConfig: - Public: - SubscriptionConfiguration: $(sub-config-devcenter-test-resources) - Location: "eastus" + Public: + SubscriptionConfiguration: $(sub-config-devcenter-test-resources) + Location: "eastus" diff --git a/sdk/digitaltwins/tests.yml b/sdk/digitaltwins/tests.yml index f75d7c49f83f..e34aeff22e03 100644 --- a/sdk/digitaltwins/tests.yml +++ b/sdk/digitaltwins/tests.yml @@ -1,13 +1,9 @@ trigger: none extends: - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: digitaltwins CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: westcentralus - Clouds: Public diff --git a/sdk/documentintelligence/tests.yml b/sdk/documentintelligence/tests.yml index f36931843304..4fb588b2f362 100644 --- a/sdk/documentintelligence/tests.yml +++ b/sdk/documentintelligence/tests.yml @@ -1,13 +1,9 @@ trigger: none extends: - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: documentintelligence CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: 'eastus' - SupportedClouds: 'Public' diff --git a/sdk/extension-wcf/tests.yml b/sdk/extension-wcf/tests.yml deleted file mode 100644 index 53fbe6244970..000000000000 --- a/sdk/extension-wcf/tests.yml +++ /dev/null @@ -1,31 +0,0 @@ -trigger: none - -extends: - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - ServiceDirectory: extension-wcf - BuildInParallel: true - TimeoutInMinutes: 180 - Location: canadacentral - CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json - PrivatePreview: - SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview, PrivatePreview - MatrixReplace: - # Use dedicated storage pool in canadacentral with higher memory capacity - - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage - - Pool=.*WINDOWSPOOL.*/azsdk-pool-mms-win-2022-general - EnvVars: - DYLD_LIBRARY_PATH: /usr/local/opt/openssl@3/lib - ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}: - AZURE_ONLY_TEST_LATEST_SERVICE_VERSION: true - TestSetupSteps: - - template: /sdk/storage/tests-install-azurite.yml - - bash: brew install openssl@3 - displayName: (MacOS) Install OpenSSL - condition: contains(variables['OSVmImage'], 'mac') diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml index 178ce8561bdf..4143a5e7c59d 100644 --- a/sdk/formrecognizer/tests.yml +++ b/sdk/formrecognizer/tests.yml @@ -7,20 +7,14 @@ parameters: trigger: none extends: - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: formrecognizer TimeoutInMinutes: 180 CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: '${{ parameters.Location }}' - Canary: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - Location: 'centraluseuap' - Clouds: 'Public' + # Canary regions are currently not supported in TME so disabling for now + # Canary: + # Location: 'centraluseuap' SupportedClouds: 'Public, Canary' diff --git a/sdk/identity/tests.yml b/sdk/identity/tests.yml index 628ef2381ce6..fab231bdd156 100644 --- a/sdk/identity/tests.yml +++ b/sdk/identity/tests.yml @@ -29,10 +29,8 @@ extends: CloudConfig: Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) # Contains alternate tenant, AAD app and cert info for testing - $(sub-config-identity-test-resources) - ServiceConnection: azure-sdk-tests EnvVars: ARM_OIDC_TOKEN: $(ARM_OIDC_TOKEN) ARM_CLIENT_ID: $(ARM_CLIENT_ID) diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml index ee8e84ccbfae..f8c7b9453187 100644 --- a/sdk/keyvault/tests.yml +++ b/sdk/keyvault/tests.yml @@ -10,28 +10,20 @@ extends: SupportedClouds: 'Public,UsGov,Canary' CloudConfig: Public: - 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: - 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: - - ArmTemplateParameters=^(?!.*enableHsm.*true) - # Some resource providers required for attestation are not supported in canary. - MatrixReplace: - - 'ArmTemplateParameters=(.*)enableAttestation.*?\$true(.*)/$1enableAttestation \= $false$2' + # Canary regions are currently not supported in TME so disabling for now + # Canary: + # 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: + # - ArmTemplateParameters=^(?!.*enableHsm.*true) + # # Some resource providers required for attestation are not supported in canary. + # MatrixReplace: + # - 'ArmTemplateParameters=(.*)enableAttestation.*?\$true(.*)/$1enableAttestation \= $false$2' UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) MatrixConfigs: diff --git a/sdk/modelsrepository/tests.yml b/sdk/modelsrepository/tests.yml index 235a94db0279..6a3dba66508e 100644 --- a/sdk/modelsrepository/tests.yml +++ b/sdk/modelsrepository/tests.yml @@ -5,4 +5,3 @@ extends: parameters: ServiceDirectory: modelsrepository Location: westus2 - Clouds: Preview diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml index f718501131cf..def3db965465 100644 --- a/sdk/search/tests.yml +++ b/sdk/search/tests.yml @@ -7,19 +7,6 @@ extends: SDKType: client TimeoutInMinutes: 240 MaxParallel: 2 - # TODO: change 'Preview' cloud back to public after search RP fixes deletion metadata issue - # https://github.com/Azure/azure-sdk-tools/issues/2216 - Clouds: 'Preview' - SupportedClouds: 'Preview,UsGov' - CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json - Location: 'westus' - UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json + SupportedClouds: 'Public,UsGov' EnvVars: AZURE_SEARCH_TEST_MODE: Live diff --git a/sdk/storage/tests.datamovement.yml b/sdk/storage/tests.datamovement.yml index e46100e4fc19..e0c740023ae1 100644 --- a/sdk/storage/tests.datamovement.yml +++ b/sdk/storage/tests.datamovement.yml @@ -9,14 +9,10 @@ extends: TimeoutInMinutes: 180 Location: canadacentral CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json + Public: PrivatePreview: SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview, PrivatePreview + SupportedClouds: Public, PrivatePreview MatrixReplace: # Use dedicated storage pool in canadacentral with higher memory capacity - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage diff --git a/sdk/storage/tests.functions.yml b/sdk/storage/tests.functions.yml index 892c26267508..60951d713fea 100644 --- a/sdk/storage/tests.functions.yml +++ b/sdk/storage/tests.functions.yml @@ -9,14 +9,10 @@ extends: TimeoutInMinutes: 180 Location: canadacentral CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json + Public: PrivatePreview: SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview, PrivatePreview + SupportedClouds: Public, PrivatePreview MatrixReplace: # Use dedicated storage pool in canadacentral with higher memory capacity - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage diff --git a/sdk/storage/tests.mgmt.yml b/sdk/storage/tests.mgmt.yml index 6e1cd0ccea45..601c0dc1da31 100644 --- a/sdk/storage/tests.mgmt.yml +++ b/sdk/storage/tests.mgmt.yml @@ -9,14 +9,10 @@ extends: TimeoutInMinutes: 180 Location: canadacentral CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json + Public: PrivatePreview: SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview, PrivatePreview + SupportedClouds: Public, PrivatePreview MatrixReplace: # Use dedicated storage pool in canadacentral with higher memory capacity - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml index 2421df2eabe3..5cad20c73b9b 100644 --- a/sdk/storage/tests.yml +++ b/sdk/storage/tests.yml @@ -9,14 +9,10 @@ extends: TimeoutInMinutes: 180 Location: canadacentral CloudConfig: - Preview: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json + Public: PrivatePreview: SubscriptionConfiguration: $(sub-config-storage-test-resources) - Clouds: Preview - SupportedClouds: Preview, PrivatePreview + SupportedClouds: Public, PrivatePreview MatrixReplace: # Use dedicated storage pool in canadacentral with higher memory capacity - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml index bc8f56d3baa1..84a5912897c4 100644 --- a/sdk/textanalytics/tests.yml +++ b/sdk/textanalytics/tests.yml @@ -7,23 +7,14 @@ parameters: trigger: none extends: - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: textanalytics CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: '${{ parameters.Location }}' UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json China: - 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: