From d98fa5be76dadab61aac904eb276b016a54a6c2d Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Fri, 7 Jan 2022 19:20:31 -0500
Subject: [PATCH] Update text analytics live test config to support sovereign
 cloud testing (#22376)

---
 sdk/textanalytics/tests.yml | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
index 9e16b049fbed..b657f3605f46 100644
--- a/sdk/textanalytics/tests.yml
+++ b/sdk/textanalytics/tests.yml
@@ -3,33 +3,24 @@ trigger: none
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
-      BuildTargetingString: $(BuildTargetingString)
+      BuildTargetingString: azure-ai-textanalytics
       ServiceDirectory: textanalytics
+      CloudConfig:
+        Public:
+          SubscriptionConfigurations:
+            - $(sub-config-azure-cloud-test-resources)
+            - $(sub-config-text-analytics-azure-cloud-test-resources)
+        UsGov:
+          SubscriptionConfiguration: $(sub-config-gov-test-resources)
+        China:
+          SubscriptionConfiguration: $(sub-config-cn-test-resources)
       MatrixReplace:
         - TestSamples=.*/true
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
-        AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
-        AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        # temporary env vars for custom text features
-        TEXTANALYTICS_CUSTOM_TEXT_ENDPOINT: $(js-textanalytics-test-service-endpoint)
-        TEXTANALYTICS_CUSTOM_TEXT_KEY: $(js-textanalytics-api-key-new)
-        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-single-category-classify-project-name)
-        TEXTANALYTICS_SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-single-category-classify-deployment-name)
-        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-multi-category-classify-project-name)
-        TEXTANALYTICS_MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-multi-category-classify-deployment-name)
-        TEXTANALYTICS_CUSTOM_ENTITIES_PROJECT_NAME: $(js-recognize-custom-entities-project-name)
-        TEXTANALYTICS_CUSTOM_ENTITIES_DEPLOYMENT_NAME: $(js-recognize-custom-entities-deployment-name)
-        # temporary env vars for custom text samples
-        AZURE_TEXT_ANALYTICS_ENDPOINT: $(js-textanalytics-test-service-endpoint)
-        AZURE_TEXT_ANALYTICS_KEY: $(js-textanalytics-api-key-new)
-        SINGLE_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-single-category-classify-project-name)
-        SINGLE_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-single-category-classify-deployment-name)
-        MULTI_CATEGORY_CLASSIFY_PROJECT_NAME: $(js-multi-category-classify-project-name)
-        MULTI_CATEGORY_CLASSIFY_DEPLOYMENT_NAME: $(js-multi-category-classify-deployment-name)
-        CUSTOM_ENTITIES_PROJECT_NAME: $(js-recognize-custom-entities-project-name)
-        CUSTOM_ENTITIES_DEPLOYMENT_NAME: $(js-recognize-custom-entities-deployment-name)
+        AZURE_SUBSCRIPTION_ID: $(TEXTANALYTICS_SUBSCRIPTION_ID)
+        AZURE_TENANT_ID: $(TEXTANALYTICS_TENANT_ID)
+        AZURE_CLIENT_SECRET: $(TEXTANALYTICS_CLIENT_SECRET)
+        AZURE_CLIENT_ID: $(TEXTANALYTICS_CLIENT_ID)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'