[live tests] Minor fixes for SupportedClouds and Location overrides/d…

…efaults (Azure#17039) * Default to true when live test platform does not have SupportedClouds override * Fall back to empty location default for live tests * simplify null checks
annelo-msft · Feb 17, 2021 · 0140d12 · 0140d12
1 parent 416240c
commit 0140d12
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-host.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-host.yml
@@ -20,7 +20,7 @@ jobs:
       UsePlatformContainer: false
       Platforms:
         ${{ each platform in parameters.Platforms }}:
-          ${{ if eq(platform.value.Container, '') }}:
+          ${{ if not(platform.value.Container) }}:
             ${{ platform.key }}: ${{ platform.value }}
       CloudConfig: ${{ parameters.CloudConfig }}
       ${{ each param in parameters.AdditionalParameters }}:
@@ -33,7 +33,7 @@ jobs:
         UsePlatformContainer: true
         Platforms:
           ${{ each platform in parameters.Platforms }}:
-            ${{ if ne(platform.value.Container, '') }}:
+            ${{ if platform.value.Container }}:
               ${{ platform.key }}: ${{ platform.value }}
         CloudConfig: ${{ parameters.CloudConfig }}
         ${{ each param in parameters.AdditionalParameters }}:

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
@@ -73,7 +73,8 @@ jobs:
 
       - template: /eng/common/TestResources/deploy-test-resources.yml
         parameters:
-          Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location, 'westus2') }}
+          ${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
+            Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
           ServiceDirectory: '${{ parameters.ServiceDirectory }}'
           SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
           ArmTemplateParameters: $(ArmTemplateParameters)

diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -110,8 +110,8 @@ stages:
           parameters:
             # Flag to include the job template with a container field
             ${{ each platform in parameters.AdditionalPlatforms }}:
-              ${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
-                ${{ if ne(platform.value.Container, '') }}:
+              ${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
+                ${{ if platform.value.Container }}:
                   UsePlatformContainer: true
             AdditionalParameters:
               PreSteps:
@@ -130,10 +130,10 @@ stages:
             Platforms:
               # Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
               ${{ each platform in parameters.Platforms }}:
-                ${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
+                ${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
                   ${{ platform.key }}: ${{ platform.value }}
               ${{ each platform in parameters.AdditionalPlatforms }}:
-                ${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
+                ${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
                   ${{ platform.key }}: ${{ platform.value }}
             CloudConfig:
               SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}