Skip to content

Commit 76b3310

Browse files
authored
[live tests] Minor fixes for SupportedClouds and Location overrides/defaults (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
1 parent d1b735e commit 76b3310

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

eng/pipelines/templates/jobs/archetype-sdk-tests-host.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
UsePlatformContainer: false
2121
Platforms:
2222
${{ each platform in parameters.Platforms }}:
23-
${{ if eq(platform.value.Container, '') }}:
23+
${{ if not(platform.value.Container) }}:
2424
${{ platform.key }}: ${{ platform.value }}
2525
CloudConfig: ${{ parameters.CloudConfig }}
2626
${{ each param in parameters.AdditionalParameters }}:
@@ -33,7 +33,7 @@ jobs:
3333
UsePlatformContainer: true
3434
Platforms:
3535
${{ each platform in parameters.Platforms }}:
36-
${{ if ne(platform.value.Container, '') }}:
36+
${{ if platform.value.Container }}:
3737
${{ platform.key }}: ${{ platform.value }}
3838
CloudConfig: ${{ parameters.CloudConfig }}
3939
${{ each param in parameters.AdditionalParameters }}:

eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ jobs:
7373

7474
- template: /eng/common/TestResources/deploy-test-resources.yml
7575
parameters:
76-
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location, 'westus2') }}
76+
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
77+
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
7778
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
7879
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
7980
ArmTemplateParameters: $(ArmTemplateParameters)

eng/pipelines/templates/stages/archetype-sdk-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ stages:
110110
parameters:
111111
# Flag to include the job template with a container field
112112
${{ each platform in parameters.AdditionalPlatforms }}:
113-
${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
114-
${{ if ne(platform.value.Container, '') }}:
113+
${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
114+
${{ if platform.value.Container }}:
115115
UsePlatformContainer: true
116116
AdditionalParameters:
117117
PreSteps:
@@ -130,10 +130,10 @@ stages:
130130
Platforms:
131131
# Enumerate platforms and additional platforms based on supported clouds (sparse platform<-->cloud matrix).
132132
${{ each platform in parameters.Platforms }}:
133-
${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
133+
${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
134134
${{ platform.key }}: ${{ platform.value }}
135135
${{ each platform in parameters.AdditionalPlatforms }}:
136-
${{ if contains(coalesce(platform.value.SupportedClouds, parameters.Clouds), cloud.key) }}:
136+
${{ if or(not(platform.value.SupportedClouds), contains(platform.value.SupportedClouds, cloud.key)) }}:
137137
${{ platform.key }}: ${{ platform.value }}
138138
CloudConfig:
139139
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}

0 commit comments

Comments
 (0)