Update test configs to use new TME tenant (#37667)

- Update usgov and china configs to use default service connection
Azure · Oct 7, 2024 · c759481 · c759481
1 parent 5557c7a
commit c759481
Show file tree

Hide file tree

Showing 30 changed files with 90 additions and 400 deletions.
diff --git 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
@@ -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,131 +93,74 @@ parameters:
     default: 'whl'
   - name: Packages
     type: object
-    default: []
+    default: null
   - name: UseFederatedAuth
     type: boolean
     default: true
 
 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
@@ -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
@@ -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