From c276c748b8bc9c1253a880c8857845a801dbc7e1 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Tue, 4 Jun 2024 19:07:20 -0400 Subject: [PATCH 1/3] Plumb env vars through deploy test resources --- eng/common/TestResources/deploy-test-resources.yml | 5 +++++ eng/common/TestResources/remove-test-resources.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index b4197dc236..0f5b1c3396 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -3,6 +3,7 @@ parameters: ArmTemplateParameters: '@{}' DeleteAfterHours: 8 Location: '' + EnvVars: {} SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ServiceConnection: not-specified ResourceType: test @@ -47,6 +48,8 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) + ${{ each var in parameters.EnvVars }}: + ${{ var.key }}: ${{ var.value }} inputs: azureSubscription: ${{ parameters.ServiceConnection }} azurePowerShellVersion: LatestVersion @@ -106,3 +109,5 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) + ${{ each var in parameters.EnvVars }}: + ${{ var.key }}: ${{ var.value }} diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 89aa7d825e..5009eb53f2 100644 --- a/eng/common/TestResources/remove-test-resources.yml +++ b/eng/common/TestResources/remove-test-resources.yml @@ -6,6 +6,7 @@ parameters: SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ServiceConnection: not-specified ResourceType: test + EnvVars: {} UseFederatedAuth: false SubscriptionConfigurationFilePath: '' @@ -29,6 +30,7 @@ steps: displayName: Remove test resources condition: and(eq(variables['CI_HAS_DEPLOYED_RESOURCES'], 'true'), ne(variables['Skip.RemoveTestResources'], 'true')) continueOnError: true + env: ${{ parameters.EnvVars }} inputs: azureSubscription: ${{ parameters.ServiceConnection }} azurePowerShellVersion: LatestVersion @@ -78,3 +80,4 @@ steps: displayName: Remove test resources condition: and(eq(variables['CI_HAS_DEPLOYED_RESOURCES'], 'true'), ne(variables['Skip.RemoveTestResources'], 'true')) continueOnError: true + env: ${{ parameters.EnvVars }} From e0f362e84adb725a188f09fb942990f23217c044 Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Wed, 5 Jun 2024 17:36:23 -0400 Subject: [PATCH 2/3] Update eng/common/TestResources/deploy-test-resources.yml Co-authored-by: Daniel Jurek --- eng/common/TestResources/deploy-test-resources.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index 0f5b1c3396..d9efad9757 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -48,8 +48,7 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) - ${{ each var in parameters.EnvVars }}: - ${{ var.key }}: ${{ var.value }} + ${{ insert }}: ${{ parameters.EnvVars }} inputs: azureSubscription: ${{ parameters.ServiceConnection }} azurePowerShellVersion: LatestVersion From 239b9ef173343b238423530da20b2683cea068de Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Wed, 5 Jun 2024 17:36:29 -0400 Subject: [PATCH 3/3] Update eng/common/TestResources/deploy-test-resources.yml Co-authored-by: Daniel Jurek --- eng/common/TestResources/deploy-test-resources.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index d9efad9757..724dfd8add 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -108,5 +108,4 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) - ${{ each var in parameters.EnvVars }}: - ${{ var.key }}: ${{ var.value }} + ${{ insert }}: ${{ parameters.EnvVars }}