Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[live tests] Minor fixes for SupportedClouds and Location overrides/defaults #17039

Merged
merged 3 commits into from
Nov 20, 2020
Merged

[live tests] Minor fixes for SupportedClouds and Location overrides/defaults #17039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3528055
Default to true when live test platform does not have SupportedClouds…
benbp Nov 18, 2020
e167e53
Fall back to empty location default for live tests
benbp Nov 18, 2020
4bb03df
simplify null checks
benbp Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/archetype-sdk-tests-host.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}:
Expand All @@ -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 }}:
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/templates/jobs/archetype-sdk-tests-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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) }}:
benbp marked this conversation as resolved.
Show resolved Hide resolved
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
ArmTemplateParameters: $(ArmTemplateParameters)
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,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:
Expand All @@ -134,10 +134,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 }}
Expand Down