Remove or fix azure* environment variables in live tests

Azure · Oct 9, 2024 · fc7a315 · fc7a315
1 parent a6aa7a3
commit fc7a315
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 53 deletions.
diff --git a/sdk/cognitivelanguage/tests.yml b/sdk/cognitivelanguage/tests.yml
@@ -18,10 +18,7 @@ extends:
         AZURE_CONVERSATIONS_DEPLOYMENT_NAME: $(clu-project-deployment)
         AZURE_CONVERSATIONS_WORKFLOW_PROJECT_NAME: $(clu-workflow-project)
         AZURE_CONVERSATIONS_WORKFLOW_DEPLOYMENT_NAME: $(clu-workflow-project-deployment)
-        AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
-        AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
-        AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
+        AZURE_SUBSCRIPTION_ID: $(COGNITIVELANGUAGE_SUBSCRIPTION_ID)
         TEST_MODE: "RunLiveNoRecord" # use when allowing preparers to create the rgs for you
         AZURE_TEST_RUN_LIVE: 'true'
         AZURE_SKIP_LIVE_RECORDING: 'true'
diff --git a/sdk/confidentialledger/tests.yml b/sdk/confidentialledger/tests.yml
@@ -9,10 +9,6 @@ extends:
         - TestSamples=.*/true
       MaxParallel: 1
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)
-        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)
         TEST_MODE: "RunLiveNoRecord" # use when allowing preparers to create the rgs for you
         AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
-        AZURE_SKIP_LIVE_RECORDING: 'True'
+        AZURE_SKIP_LIVE_RECORDING: 'True'
diff --git a/sdk/documentintelligence/tests.yml b/sdk/documentintelligence/tests.yml
@@ -13,7 +13,6 @@ extends:
         Public:
           Location: eastus
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'
diff --git a/sdk/evaluation/tests.yml b/sdk/evaluation/tests.yml
@@ -7,9 +7,5 @@ extends:
       MatrixReplace:
         - TestSamples=.*/true
       EnvVars:
-        AZURE_CLIENT_ID: $(EVALUATION_CLIENT_ID)
-        AZURE_CLIENT_SECRET: $(EVALUATION_CLIENT_SECRET)
-        AZURE_TENANT_ID: $(EVALUATION_TENANT_ID)
-        AZURE_SUBSCRIPTION_ID: $(EVALUATION_SUBSCRIPTION_ID)
         TEST_MODE: 'RunLiveNoRecord' # use when allowing preparers to create the rgs for you
         AZURE_TEST_RUN_LIVE: 'true' # use when utilizing the New-TestResources Script
diff --git a/sdk/eventhub/azure-mgmt-eventhub/tests.yml b/sdk/eventhub/azure-mgmt-eventhub/tests.yml
@@ -1,15 +1,11 @@
 trigger: none
 
 extemds:
-    template: ../../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: eventhub
       BuildTargetingString: azure-mgmt-eventhub
       EnvVars:
-        AZURE_CLIENT_ID: $(python-eh-livetest-event-hub-aad-client-id)
-        AZURE_TENANT_ID: $(python-eh-livetest-event-hub-aad-tenant-id)
-        AZURE_CLIENT_SECRET: $(python-eh-livetest-event-hub-aad-secret)
-        AZURE_SUBSCRIPTION_ID: $(python-eh-livetest-event-hub-subscription-id)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_TEST_RUN_LIVE: 'true'
         AZURE_SKIP_LIVE_RECORDING: 'True'
diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml
@@ -17,7 +17,6 @@ extends:
           ServiceConnection: azure-sdk-tests
           Location: 'centraluseuap'
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'

diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
@@ -26,5 +26,5 @@ extends:
       EnvVars:
         AZURE_TEST_RUN_LIVE: true
         AZURE_SKIP_LIVE_RECORDING: 'True'
-        AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
+        AZURE_SUBSCRIPTION_ID: $(KEYVAULT_SUBSCRIPTION_ID)
         AZURE_CLIENT_OID: $(aad-azure-sdk-test-client-oid)
diff --git a/sdk/metricsadvisor/tests.yml b/sdk/metricsadvisor/tests.yml
@@ -1,15 +1,11 @@
 trigger: none
 
 extends:
-    template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       BuildTargetingString: azure-ai-metricsadvisor
       ServiceDirectory: metricsadvisor
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(provisioner-subscription)
-        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)
         METRICS_ADVISOR_ENDPOINT: $(metricsadvisor-test-service-endpoint)
         METRICS_ADVISOR_SUBSCRIPTION_KEY: $(metricsadvisor-test-subscription-key)
         METRICS_ADVISOR_API_KEY: $(python-metricsadvisor-test-api-key)

diff --git a/sdk/personalizer/tests.yml b/sdk/personalizer/tests.yml
@@ -1,22 +1,18 @@
 trigger: none
 
 extends:
-    template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       BuildTargetingString: azure-ai-personalizer
       ServiceDirectory: personalizer
       Clouds: Canary
       MatrixReplace:
         - TestSamples=.*/true
       EnvVars:
-        AZURE_CLIENT_ID: $(PERSONALIZER_CLIENT_ID)
-        AZURE_TENANT_ID: $(PERSONALIZER_TENANT_ID)
-        AZURE_SUBSCRIPTION_ID: $(PERSONALIZER_SUBSCRIPTION_ID)
-        AZURE_CLIENT_SECRET: $(PERSONALIZER_CLIENT_SECRET)
         TEST_MODE: 'RunLiveNoRecord'
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'
         PERSONALIZER_PRESET_ENDPOINT_SINGLE_SLOT: $(java-personalizer-test-singleslot-endpoint)
         PERSONALIZER_PRESET_API_KEY_SINGLE_SLOT: $(java-personalizer-test-singleslot-api-key)
         PERSONALIZER_PRESET_ENDPOINT_MULTI_SLOT: $(java-personalizer-test-multislot-endpoint)
-        PERSONALIZER_PRESET_API_KEY_MULTI_SLOT: $(java-personalizer-test-multislot-api-key)
+        PERSONALIZER_PRESET_API_KEY_MULTI_SLOT: $(java-personalizer-test-multislot-api-key)
diff --git a/sdk/schemaregistry/tests.yml b/sdk/schemaregistry/tests.yml
@@ -1,13 +1,12 @@
 trigger: none
 
 extends:
-    template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: schemaregistry
       TestTimeoutInMinutes: 300
       BuildTargetingString: azure-schemaregistry*
       EnvVars:
-        AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'
       MatrixFilters:

diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml
@@ -31,4 +31,4 @@ extends:
       EnvVars:
         AZURE_SKIP_LIVE_RECORDING: 'True'
         AZURE_TEST_RUN_LIVE: 'true'
-        AZURE_SUBSCRIPTION_ID: $(azure-subscription-id)
+        AZURE_SUBSCRIPTION_ID: $(STORAGE_SUBSCRIPTION_ID)
diff --git a/sdk/template/tests.yml b/sdk/template/tests.yml
@@ -7,9 +7,5 @@ extends:
       MatrixReplace:
         - TestSamples=.*/true
       EnvVars:
-        AZURE_CLIENT_ID: $(TEMPLATE_CLIENT_ID)
-        AZURE_CLIENT_SECRET: $(TEMPLATE_CLIENT_SECRET)
-        AZURE_TENANT_ID: $(TEMPLATE_TENANT_ID)
-        AZURE_SUBSCRIPTION_ID: $(TEMPLATE_SUBSCRIPTION_ID)
         TEST_MODE: 'RunLiveNoRecord' # use when allowing preparers to create the rgs for you
         AZURE_TEST_RUN_LIVE: 'true' # use when utilizing the New-TestResources Script
diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
@@ -1,7 +1,7 @@
 trigger: none
 
 extends:
-    template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       BuildTargetingString: azure-ai-textanalytics
       ServiceDirectory: textanalytics
@@ -17,10 +17,6 @@ extends:
           Location: chinanorth3
       SupportedClouds: 'Public,UsGov,China'
       EnvVars:
-        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'
diff --git a/sdk/webpubsub/tests.yml b/sdk/webpubsub/tests.yml
@@ -1,21 +1,13 @@
 trigger: none
 
 extends:
-    template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       BuildTargetingString: azure*
       ServiceDirectory: webpubsub
       MatrixReplace:
         - TestSamples=.*/true
       EnvVars:
-        WEBPUBSUB_TENANT_ID: $(webpubsub-tenant-id)
-        WEBPUBSUB_CLIENT_ID: $(webpubsub-client-id)
-        WEBPUBSUB_CLIENT_SECRET: $(webpubsub-client-secret)
-        WEBPUBSUB_SUBSCRIPTION_ID: $(webpubsub-subscription-id)
-        AZURE_TENANT_ID: $(webpubsub-tenant-id)
-        AZURE_CLIENT_ID: $(webpubsub-client-id)
-        AZURE_CLIENT_SECRET: $(webpubsub-client-secret)
-        AZURE_SUBSCRIPTION_ID: $(webpubsub-subscription-id)
         WEBPUBSUB_REVERSE_PROXY_ENDPOINT: $(webpubsub-reverse-proxy-endpoint)
         WEBPUBSUB_ENDPOINT: $(webpubsub-endpoint)
         WEBPUBSUB_CONNECTION_STRING: $(webpubsub-connection-string)