Switch to TME test subscription

Azure · Oct 11, 2024 · f017ea6 · f017ea6
1 parent bc34307
commit f017ea6
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 267 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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