Skip to content

Commit 6e5c0ef

Browse files
authored
Fix default value for env vars in build-test-resource-config template (#8528)
* Fix default value for env vars in build-test-resource-config template * Add empty pool condition * Write delete failures as warnings
1 parent eefeb1d commit 6e5c0ef

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

eng/common/TestResources/build-test-resource-config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ parameters:
88
# EnvVars is used to help diagnose variable conflict issues early
99
- name: EnvVars
1010
type: object
11-
default: null
11+
default: {}
1212
- name: SubscriptionConfigurationFilePaths
1313
type: object
1414
default: null
1515

1616
steps:
1717
- task: AzurePowerShell@5
1818
displayName: Set Pipeline Subnet Info
19+
condition: ne(variables['Pool'], '')
1920
env: ${{ parameters.EnvVars }}
2021
inputs:
2122
azureSubscription: azure-sdk-tests

eng/scripts/live-test-resource-cleanup.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,8 @@ function DeleteAndPurgeGroups([array]$toDelete) {
441441
}
442442
}
443443
} catch {
444-
Write-Error $_
444+
Write-Warning "Failure deleting/purging group $($rg.ResourceGroupName):"
445+
Write-Warning $_
445446
$hasError = $true
446447
}
447448
}

0 commit comments

Comments
 (0)