Fix Stage name

Azure · Oct 1, 2024 · 4cc1d9f · 4cc1d9f
1 parent 46f132d
commit 4cc1d9f
Showing 1 changed file with 54 additions and 56 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -105,62 +105,60 @@ extends:
       - ${{ 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)) }}:
-            - ${{ if eq(package, parameters.BuildTargetingString) }}:
-              - stage: ${{ cloud.key }}_${{ parameters.JobName }}
-            - ${{ else }}:
-              - 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(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 }}
+            - 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: