diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index eb6a2088bb63..6f3af93156db 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -4,7 +4,7 @@ parameters: default: '' - name: TestResourceDirectories type: object - default: + default: null - name: PreSteps type: object default: [] @@ -124,35 +124,20 @@ jobs: Pool: $(Pool) ${{ insert }}: ${{ parameters.EnvVars }} - - ${{ if parameters.TestResourceDirectories }}: - - ${{ each directory in parameters.TestResourceDirectories }}: - - template: /eng/common/TestResources/deploy-test-resources.yml - parameters: - Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }} - ServiceDirectory: '${{ directory }}' - 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) }}: - - template: /eng/common/TestResources/deploy-test-resources.yml - parameters: - Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }} - ServiceDirectory: '${{ parameters.ServiceDirectory }}' - SubscriptionConfiguration: $(SubscriptionConfiguration) - ArmTemplateParameters: $(ArmTemplateParameters) - UseFederatedAuth: ${{ parameters.UseFederatedAuth }} - ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }} - EnvVars: - Pool: $(Pool) - ${{ insert }}: ${{ parameters.EnvVars }} + - ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}: + - template: /eng/common/TestResources/deploy-test-resources.yml + parameters: + Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }} + ServiceDirectory: '${{ directory }}' + SubscriptionConfiguration: $(SubscriptionConfiguration) + ArmTemplateParameters: $(ArmTemplateParameters) + UseFederatedAuth: ${{ parameters.UseFederatedAuth }} + ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} + EnvVars: + Pool: $(Pool) + ${{ insert }}: ${{ parameters.EnvVars }} - - template: ../steps/build-test.yml + - template: /eng/pipelines/templates/steps/build-test.yml parameters: ServiceDirectory: ${{ parameters.ServiceDirectory }} CloudName: ${{ parameters.CloudConfig.Cloud }} @@ -170,24 +155,13 @@ jobs: TestProxy: ${{ parameters.TestProxy }} UseFederatedAuth: ${{ parameters.UseFederatedAuth }} ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }} - - ${{ 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 }} - SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }} - ${{ parameters.PostSteps }} diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml index a23662366bee..479152c93c4a 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml @@ -57,26 +57,12 @@ 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: 'centraluseuap' 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 + Location: 'chinanorth3' - name: MatrixConfigs type: object default: @@ -107,7 +93,7 @@ parameters: default: 'whl' - name: Packages type: object - default: [] + default: null - name: UseFederatedAuth type: boolean default: true @@ -115,123 +101,66 @@ parameters: extends: template: /eng/pipelines/templates/stages/1es-redirect.yml parameters: - Use1ESOfficial: false stages: - - ${{ if ne(length(parameters.Packages), 0) }}: - - ${{ each package in parameters.Packages }}: - - ${{ each cloud in parameters.CloudConfig }}: - - ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}: - - ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}: - - stage: ${{ cloud.key }}_${{ parameters.JobName }}_${{ replace(package, '-', '_') }} - dependsOn: [] - jobs: - - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml - parameters: - SparseCheckoutPaths: - - sdk/${{ parameters.ServiceDirectory }}/**/*.json - JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml - OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt - Pool: azsdk-pool-mms-ubuntu-2004-general - AdditionalParameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - TestResourceDirectories: ${{ parameters.TestResourceDirectories }} - PreSteps: - - ${{ parameters.PlatformPreSteps }} - - ${{ parameters.PreSteps }} - PostSteps: - - ${{ parameters.PlatformPostSteps }} - - ${{ parameters.PostSteps }} - EnvVars: ${{ parameters.EnvVars }} - MaxParallel: ${{ parameters.MaxParallel }} - BeforeTestSteps: ${{ parameters.BeforeTestSteps }} - AfterTestSteps: ${{ parameters.AfterTestSteps }} - AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }} - BuildTargetingString: ${{ package }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} - InjectedPackages: ${{ parameters.InjectedPackages }} - BuildDocs: ${{ parameters.BuildDocs }} - TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }} - TestProxy: ${{ parameters.TestProxy }} - ToxTestEnv: ${{ parameters.ToxTestEnv }} - UseFederatedAuth: ${{ parameters.UseFederatedAuth }} - MatrixConfigs: - # Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix). - - ${{ each config in parameters.MatrixConfigs }}: - - ${{ config }} - - ${{ each config in parameters.AdditionalMatrixConfigs }}: - - ${{ config }} - MatrixFilters: - - ${{ each cloudFilter in cloud.value.MatrixFilters }}: - - ${{ cloudFilter }} - - ${{ parameters.MatrixFilters }} - MatrixReplace: - - ${{ each cloudReplace in cloud.value.MatrixReplace }}: - - ${{ cloudReplace }} - - ${{ parameters.MatrixReplace }} - CloudConfig: - SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }} - SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }} - Location: ${{ coalesce(parameters.Location, cloud.value.Location) }} - Cloud: ${{ cloud.key }} - ServiceConnection: ${{ cloud.value.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }} - - ${{ else }}: - - ${{ each cloud in parameters.CloudConfig }}: - - ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}: - - ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}: - - stage: ${{ cloud.key }}_${{ parameters.JobName }} - dependsOn: [] - jobs: - - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml - parameters: - SparseCheckoutPaths: - - sdk/${{ parameters.ServiceDirectory }}/**/*.json - JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml - OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt - Pool: azsdk-pool-mms-ubuntu-2004-general - AdditionalParameters: - ServiceDirectory: ${{ parameters.ServiceDirectory }} - TestResourceDirectories: ${{ parameters.TestResourceDirectories }} - PreSteps: - - ${{ parameters.PlatformPreSteps }} - - ${{ parameters.PreSteps }} - PostSteps: - - ${{ parameters.PlatformPostSteps }} - - ${{ parameters.PostSteps }} - EnvVars: ${{ parameters.EnvVars }} - MaxParallel: ${{ parameters.MaxParallel }} - BeforeTestSteps: ${{ parameters.BeforeTestSteps }} - AfterTestSteps: ${{ parameters.AfterTestSteps }} - AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }} - BuildTargetingString: ${{ parameters.BuildTargetingString }} - TestMarkArgument: ${{ parameters.TestMarkArgument }} - InjectedPackages: ${{ parameters.InjectedPackages }} - BuildDocs: ${{ parameters.BuildDocs }} - TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }} - TestProxy: ${{ parameters.TestProxy }} - ToxTestEnv: ${{ parameters.ToxTestEnv }} - UseFederatedAuth: ${{ parameters.UseFederatedAuth }} - MatrixConfigs: - # Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix). - - ${{ each config in parameters.MatrixConfigs }}: - - ${{ config }} - - ${{ each config in parameters.AdditionalMatrixConfigs }}: - - ${{ config }} - MatrixFilters: - - ${{ each cloudFilter in cloud.value.MatrixFilters }}: - - ${{ cloudFilter }} - - ${{ parameters.MatrixFilters }} - MatrixReplace: - - ${{ each cloudReplace in cloud.value.MatrixReplace }}: - - ${{ cloudReplace }} - - ${{ parameters.MatrixReplace }} - CloudConfig: - SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }} - SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }} - Location: ${{ coalesce(parameters.Location, cloud.value.Location) }} - Cloud: ${{ cloud.key }} - ServiceConnection: ${{ cloud.value.ServiceConnection }} - SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }} + - ${{ each package in coalesce(parameters.Packages, split(parameters.BuildTargetingString, '|')) }}: + - ${{ each cloud in parameters.CloudConfig }}: + - ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), contains(parameters.SupportedClouds, cloud.key))) }}: + - ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}: + - stage: + displayName: ${{ format('{0} {1} {2}', cloud.key, parameters.JobName, package) }} + dependsOn: [] + jobs: + - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml + parameters: + SparseCheckoutPaths: + - sdk/${{ parameters.ServiceDirectory }}/**/*.json + JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml + OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt + Pool: azsdk-pool-mms-ubuntu-2004-general + AdditionalParameters: + ServiceDirectory: ${{ parameters.ServiceDirectory }} + TestResourceDirectories: ${{ parameters.TestResourceDirectories }} + PreSteps: + - ${{ parameters.PlatformPreSteps }} + - ${{ parameters.PreSteps }} + PostSteps: + - ${{ parameters.PlatformPostSteps }} + - ${{ parameters.PostSteps }} + EnvVars: ${{ parameters.EnvVars }} + MaxParallel: ${{ parameters.MaxParallel }} + BeforeTestSteps: ${{ parameters.BeforeTestSteps }} + AfterTestSteps: ${{ parameters.AfterTestSteps }} + AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }} + BuildTargetingString: ${{ package }} + TestMarkArgument: ${{ parameters.TestMarkArgument }} + InjectedPackages: ${{ parameters.InjectedPackages }} + BuildDocs: ${{ parameters.BuildDocs }} + TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }} + TestProxy: ${{ parameters.TestProxy }} + ToxTestEnv: ${{ parameters.ToxTestEnv }} + UseFederatedAuth: ${{ parameters.UseFederatedAuth }} + MatrixConfigs: + # Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix). + - ${{ each config in parameters.MatrixConfigs }}: + - ${{ config }} + - ${{ each config in parameters.AdditionalMatrixConfigs }}: + - ${{ config }} + MatrixFilters: + - ${{ each cloudFilter in cloud.value.MatrixFilters }}: + - ${{ cloudFilter }} + - ${{ parameters.MatrixFilters }} + MatrixReplace: + - ${{ each cloudReplace in cloud.value.MatrixReplace }}: + - ${{ cloudReplace }} + - ${{ parameters.MatrixReplace }} + CloudConfig: + SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }} + SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }} + Location: ${{ coalesce(cloud.value.Location, parameters.Location) }} + Cloud: ${{ cloud.key }} + ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }} + SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }} + - template: /eng/pipelines/templates/stages/python-analyze-weekly.yml parameters: BuildTargetingString: ${{ parameters.BuildTargetingString }} diff --git a/sdk/agrifood/tests.yml b/sdk/agrifood/tests.yml index 9f894a4cbe61..d8abd0bbfa75 100644 --- a/sdk/agrifood/tests.yml +++ b/sdk/agrifood/tests.yml @@ -8,6 +8,7 @@ extends: Clouds: Public_FarmBeats CloudConfig: Public_Farmbeats: + ServiceConnection: azure-sdk-tests-public #Might need a specific service connection if this is a unique sub. SubscriptionConfiguration: $(sub-config-farmbeats-azure-cloud-test-resources) EnvVars: AZURE_CLIENT_ID: $(AGRIFOOD_CLIENT_ID) diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index 93b73f037ef7..1d21e8994abb 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -8,26 +8,16 @@ parameters: - azure-appconfiguration-provider extends: - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml + template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: ServiceDirectory: appconfiguration Packages: ${{ parameters.Services }} SupportedClouds: 'Public,UsGov,China' TestTimeoutInMinutes: 240 - UseFederatedAuth: true CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json 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 Location: chinanorth3 MatrixReplace: - TestSamples=.*/true diff --git a/sdk/communication/azure-communication-chat/tests.yml b/sdk/communication/azure-communication-chat/tests.yml index 3dbb7fdb2400..248ef3e7efd3 100644 --- a/sdk/communication/azure-communication-chat/tests.yml +++ b/sdk/communication/azure-communication-chat/tests.yml @@ -8,12 +8,8 @@ extends: ServiceDirectory: communication MatrixReplace: - TestSamples=.*/true - UseFederatedAuth: true 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-python) diff --git a/sdk/communication/azure-communication-email/tests.yml b/sdk/communication/azure-communication-email/tests.yml index a41ca3af06a3..879d6b250f6e 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: @@ -13,25 +7,10 @@ extends: JobName: email ServiceDirectory: communication CloudConfig: - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-python) - MatrixReplace: - - TestSamples=.*/true Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-python) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-python) - ${{ if eq(parameters.runOnlyPPE, true) }}: - Clouds: 'PPE' - ${{ if eq(parameters.runOnlyPPE, false) }}: - Clouds: 'Public,Int,PPE' EnvVars: AZURE_SKIP_LIVE_RECORDING: 'True' AZURE_TEST_RUN_LIVE: 'true' diff --git a/sdk/communication/azure-communication-identity/tests.yml b/sdk/communication/azure-communication-identity/tests.yml index 64c33c1ea3fc..08a10144aedc 100644 --- a/sdk/communication/azure-communication-identity/tests.yml +++ b/sdk/communication/azure-communication-identity/tests.yml @@ -8,12 +8,8 @@ extends: ServiceDirectory: communication MatrixReplace: - TestSamples=.*/true - UseFederatedAuth: true 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-python) diff --git a/sdk/communication/azure-communication-phonenumbers/tests.yml b/sdk/communication/azure-communication-phonenumbers/tests.yml index 77579bf329af..ad1872290539 100644 --- a/sdk/communication/azure-communication-phonenumbers/tests.yml +++ b/sdk/communication/azure-communication-phonenumbers/tests.yml @@ -9,24 +9,11 @@ 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-python) MatrixReplace: - TestSamples=.*/true - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-python) - MatrixReplace: - - COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST=false/true - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-python) - MatrixReplace: - - COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST=false/true - Clouds: Public, PPE, Int + Clouds: Public EnvVars: AZURE_SKIP_LIVE_RECORDING: 'True' AZURE_TEST_RUN_LIVE: 'true' diff --git a/sdk/communication/azure-communication-rooms/tests.yml b/sdk/communication/azure-communication-rooms/tests.yml index 51cfdc540abe..ab20b3ff303b 100644 --- a/sdk/communication/azure-communication-rooms/tests.yml +++ b/sdk/communication/azure-communication-rooms/tests.yml @@ -8,12 +8,8 @@ extends: ServiceDirectory: communication MatrixReplace: - TestSamples=.*/true - UseFederatedAuth: true 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-python) diff --git a/sdk/communication/azure-communication-sms/tests.yml b/sdk/communication/azure-communication-sms/tests.yml index 309732c1aa2e..d631f9cddf7e 100644 --- a/sdk/communication/azure-communication-sms/tests.yml +++ b/sdk/communication/azure-communication-sms/tests.yml @@ -9,9 +9,6 @@ extends: Clouds: Public 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) diff --git a/sdk/communication/tests.yml b/sdk/communication/tests.yml index d33b054f35b3..86eeed541ef8 100644 --- a/sdk/communication/tests.yml +++ b/sdk/communication/tests.yml @@ -25,19 +25,11 @@ extends: ServiceDirectory: communication TestResourceDirectories: ${{ parameters.TestResourceDirectories }} Packages: ${{ parameters.Services }} - UseFederatedAuth: true 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-python) MatrixReplace: - TestSamples=.*/true - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-python) - Clouds: Public,Int + Clouds: Public diff --git a/sdk/containerregistry/tests.yml b/sdk/containerregistry/tests.yml index 72582fb039de..78523fe70f2c 100644 --- a/sdk/containerregistry/tests.yml +++ b/sdk/containerregistry/tests.yml @@ -7,21 +7,6 @@ extends: ServiceDirectory: containerregistry SupportedClouds: 'Public,UsGov,China' TestTimeoutInMinutes: 240 - UseFederatedAuth: true - CloudConfig: - Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - 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 - Location: chinanorth3 MatrixReplace: - TestSamples=.*/true EnvVars: diff --git a/sdk/documentintelligence/tests.yml b/sdk/documentintelligence/tests.yml index c7121361ce49..382e79637d4a 100644 --- a/sdk/documentintelligence/tests.yml +++ b/sdk/documentintelligence/tests.yml @@ -6,18 +6,11 @@ extends: BuildTargetingString: azure-ai-documentintelligence ServiceDirectory: documentintelligence TestTimeoutInMinutes: 200 - UseFederatedAuth: true MatrixReplace: - TestSamples=.*/true - Clouds: 'Prod' - # This is a specific request from the formrecognizer service team - # their claim is that the full matrix ends up stress-testing their service. - # As such, the canary test runs should run on a reduced matrix. + Clouds: 'Public' CloudConfig: - Prod: - ServiceConnection: azure-sdk-tests-preview - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePreviewMsft.json + Public: Location: eastus EnvVars: AZURE_SUBSCRIPTION_ID: $(provisioner-subscription) diff --git a/sdk/eventgrid/tests.yml b/sdk/eventgrid/tests.yml index c8234cb9f1fd..0463dbe7ff19 100644 --- a/sdk/eventgrid/tests.yml +++ b/sdk/eventgrid/tests.yml @@ -6,7 +6,6 @@ extends: ServiceDirectory: eventgrid BuildTargetingString: azure-eventgrid* Location: eastus - UseFederatedAuth: true MatrixReplace: - TestSamples=.*/true EnvVars: diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index 969d73ef78b7..ddccd9cbfe6e 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -5,23 +5,8 @@ extends: parameters: ServiceDirectory: eventhub TestTimeoutInMinutes: 240 - UseFederatedAuth: true BuildTargetingString: azure-eventhub* SupportedClouds: 'Public,UsGov,China' - CloudConfig: - Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - 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 - Location: 'chinanorth3' MatrixFilters: - PythonVersion=^(?!pypy3).* EnvVars: diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml index ff7b2375ee59..f20441208ddb 100644 --- a/sdk/formrecognizer/tests.yml +++ b/sdk/formrecognizer/tests.yml @@ -6,7 +6,6 @@ extends: BuildTargetingString: azure-ai-formrecognizer ServiceDirectory: formrecognizer TestTimeoutInMinutes: 200 - UseFederatedAuth: true MatrixReplace: - TestSamples=.*/true Clouds: 'Prod' @@ -16,8 +15,6 @@ extends: CloudConfig: Prod: ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: 'centraluseuap' EnvVars: AZURE_SUBSCRIPTION_ID: $(provisioner-subscription) diff --git a/sdk/healthinsights/tests.yml b/sdk/healthinsights/tests.yml index 15b92dddd134..7c6b2dff8e62 100644 --- a/sdk/healthinsights/tests.yml +++ b/sdk/healthinsights/tests.yml @@ -9,7 +9,6 @@ trigger: none extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: - UseFederatedAuth: true ServiceDirectory: healthinsights Location: '${{ parameters.Location }}' EnvVars: diff --git a/sdk/identity/tests.yml b/sdk/identity/tests.yml index 66c8610f8775..7c00a6351796 100644 --- a/sdk/identity/tests.yml +++ b/sdk/identity/tests.yml @@ -9,7 +9,7 @@ extends: - task: AzureCLI@2 displayName: Set OIDC variables inputs: - azureSubscription: azure-sdk-tests + azureSubscription: azure-sdk-tests-public scriptType: pscore scriptLocation: inlineScript addSpnToEnvironment: true @@ -29,11 +29,7 @@ extends: CloudConfig: Public: SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-identity-test-resources) - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json ${{ if contains(variables['Build.DefinitionName'], 'tests-weekly') }}: # Test Managed Identity integrations tests on weekly tests pipeline. AdditionalMatrixConfigs: diff --git a/sdk/keyvault/azure-keyvault-administration/tests.yml b/sdk/keyvault/azure-keyvault-administration/tests.yml index 339df26b8270..5e36b06550c8 100644 --- a/sdk/keyvault/azure-keyvault-administration/tests.yml +++ b/sdk/keyvault/azure-keyvault-administration/tests.yml @@ -8,15 +8,10 @@ extends: JobName: azure_keyvault_administration SupportedClouds: 'Public' TestTimeoutInMinutes: 240 - UseFederatedAuth: true # Since we don't use HSMs in USGov or China clouds, just run Admin tests in Public. CloudConfig: Public: Location: 'westus2' - SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json # HSMs are expensive and restricted in number so we only test them on one platform. AdditionalMatrixConfigs: - Name: keyvault_hsm_matrix_addons diff --git a/sdk/keyvault/azure-keyvault-keys/tests.yml b/sdk/keyvault/azure-keyvault-keys/tests.yml index 911e53f1ea65..b79305602260 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests.yml +++ b/sdk/keyvault/azure-keyvault-keys/tests.yml @@ -8,23 +8,14 @@ extends: JobName: azure_keyvault_keys SupportedClouds: 'Public,UsGov,China' TestTimeoutInMinutes: 240 - UseFederatedAuth: true CloudConfig: Public: Location: 'westus2' - 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) MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) - ServiceConnection: usgov_azure-sdk-tests China: - Location: chinaeast2 - SubscriptionConfiguration: $(sub-config-cn-test-resources) - ServiceConnection: china_azure-sdk-tests + Location: chinanorth3 MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) # HSMs are expensive and restricted in number so we only test them on one platform. diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml index 16000ab1d8b8..796658edb40a 100644 --- a/sdk/keyvault/tests.yml +++ b/sdk/keyvault/tests.yml @@ -14,25 +14,15 @@ extends: Packages: ${{ parameters.Services }} SupportedClouds: 'Public,UsGov,China' TestTimeoutInMinutes: 240 - UseFederatedAuth: true CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) China: - ServiceConnection: china_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureChinaMsft.json MatrixFilters: - ArmTemplateParameters=^(?!.*enableHsm.*true) - Location: chinaeast2 + Location: chinanorth3 EnvVars: AZURE_TEST_RUN_LIVE: true AZURE_SKIP_LIVE_RECORDING: 'True' diff --git a/sdk/monitor/tests.yml b/sdk/monitor/tests.yml index 3ec5d124875a..5ba23c382645 100644 --- a/sdk/monitor/tests.yml +++ b/sdk/monitor/tests.yml @@ -9,7 +9,7 @@ extends: - task: AzureCLI@2 displayName: Set OIDC variables inputs: - azureSubscription: azure-sdk-tests + azureSubscription: azure-sdk-tests-public scriptType: pscore scriptLocation: inlineScript addSpnToEnvironment: true @@ -18,23 +18,6 @@ extends: ServiceDirectory: monitor TestTimeoutInMinutes: 300 BuildTargetingString: azure-monitor-* - SupportedClouds: 'Public,UsGov,China' - CloudConfig: - Public: - SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - 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 - Location: chinanorth3 - UseFederatedAuth: true EnvVars: AZURE_SUBSCRIPTION_ID: $(MONITOR_SUBSCRIPTION_ID) AZURE_TEST_RUN_LIVE: 'true' diff --git a/sdk/openai/tests.yml b/sdk/openai/tests.yml index 77af1d66d6bb..59de29d79b53 100644 --- a/sdk/openai/tests.yml +++ b/sdk/openai/tests.yml @@ -9,7 +9,6 @@ extends: - PythonVersion=3.11.* MatrixReplace: - TestSamples=.*/true - UseFederatedAuth: true SupportedClouds: 'Public' EnvVars: AZ_OPENAI_ENDPOINT: $(AOAI-ENDPOINT) diff --git a/sdk/schemaregistry/tests.yml b/sdk/schemaregistry/tests.yml index 17a2402b9363..90ec22bfb893 100644 --- a/sdk/schemaregistry/tests.yml +++ b/sdk/schemaregistry/tests.yml @@ -6,15 +6,9 @@ extends: ServiceDirectory: schemaregistry TestTimeoutInMinutes: 300 BuildTargetingString: azure-schemaregistry* - UseFederatedAuth: true EnvVars: AZURE_SUBSCRIPTION_ID: $(azure-subscription-id) AZURE_SKIP_LIVE_RECORDING: 'True' AZURE_TEST_RUN_LIVE: 'true' MatrixFilters: - '"PythonVersion=^(?!pypy3).*"' - CloudConfig: - Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml index 3b58a0efff19..1ee036243917 100644 --- a/sdk/search/tests.yml +++ b/sdk/search/tests.yml @@ -4,26 +4,8 @@ extends: template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml parameters: BuildTargetingString: azure-search-documents - # TODO: change/remove location back to default westus2 after search RP fixes deletion metadata issue - # https://github.com/Azure/azure-sdk-tools/issues/2216 SupportedClouds: 'Public,UsGov,China' TestTimeoutInMinutes: 240 - UseFederatedAuth: true - CloudConfig: - Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - Location: eastus2 - 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 - Location: chinanorth3 ServiceDirectory: search EnvVars: AZURE_TEST_RUN_LIVE: 'True' diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml index 58a94a4e97d5..1f626884fcf0 100644 --- a/sdk/servicebus/tests.yml +++ b/sdk/servicebus/tests.yml @@ -5,7 +5,6 @@ extends: parameters: ServiceDirectory: servicebus TestTimeoutInMinutes: 960 - UseFederatedAuth: true BuildTargetingString: azure-servicebus* EnvVars: AZURE_SUBSCRIPTION_ID: $(SERVICEBUS_SUBSCRIPTION_ID) @@ -14,19 +13,11 @@ extends: MatrixFilters: - PythonVersion=^(?!pypy3).* Clouds: 'Public,Canary' - SupportedClouds: 'Public,UsGov,China' + SupportedClouds: 'Public,Canary,UsGov' CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Canary: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json + ServiceConnection: azure-sdk-tests-public Location: 'eastus2euap' UsGov: - ServiceConnection: usgov_azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzureUsGovMsft.json Location: 'usgovarizona' diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml index 9d46cdfafedf..d4d45ec4f118 100644 --- a/sdk/storage/tests.yml +++ b/sdk/storage/tests.yml @@ -18,7 +18,6 @@ extends: ServiceDirectory: storage InjectedPackages: $(InjectedPackages) Packages: ${{ parameters.Services }} - UseFederatedAuth: true MatrixReplace: # Use dedicated storage pool in canadacentral with higher memory capacity - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2004-storage diff --git a/sdk/tables/tests.yml b/sdk/tables/tests.yml index 425ddcce11c1..e02fc9bb7658 100644 --- a/sdk/tables/tests.yml +++ b/sdk/tables/tests.yml @@ -7,21 +7,6 @@ extends: ServiceDirectory: tables TestTimeoutInMinutes: 180 SupportedClouds: 'Public,UsGov,China' - UseFederatedAuth: true - CloudConfig: - Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - 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 - Location: chinanorth3 MatrixReplace: - TestSamples=.*/true EnvVars: diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml index 6947b1f0ae4f..a1386c6ed7c3 100644 --- a/sdk/textanalytics/tests.yml +++ b/sdk/textanalytics/tests.yml @@ -9,18 +9,12 @@ extends: Public: Location: eastus SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-text-analytics-azure-cloud-test-resources) MatrixReplace: - TestSamples=.*/true 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 + Location: chinanorth3 SupportedClouds: 'Public,UsGov,China' EnvVars: AZURE_SUBSCRIPTION_ID: $(TEXTANALYTICS_SUBSCRIPTION_ID) diff --git a/sdk/translation/tests.yml b/sdk/translation/tests.yml index c8371a2ed8f9..a48a7f5c6bfc 100644 --- a/sdk/translation/tests.yml +++ b/sdk/translation/tests.yml @@ -5,13 +5,9 @@ extends: parameters: ServiceDirectory: translation TestTimeoutInMinutes: 200 - UseFederatedAuth: true Clouds: Public # Skipping INT, re-enable when environment fixed CloudConfig: Public: - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json Location: 'westus3' Int: # We run tests in Dogfood for the service team. This cloud config is just used to validate the service deployment