From 3635e2064ac02e954285607a090210a906c06e28 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:11:02 -0400 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 8377 (#5690) * Plumb env vars through deploy test resources * Update eng/common/TestResources/deploy-test-resources.yml Co-authored-by: Daniel Jurek * Update eng/common/TestResources/deploy-test-resources.yml Co-authored-by: Daniel Jurek --------- Co-authored-by: Ben Broderick Phillips Co-authored-by: Daniel Jurek --- eng/common/TestResources/deploy-test-resources.yml | 3 +++ eng/common/TestResources/remove-test-resources.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index b4197dc23..724dfd8ad 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,7 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) + ${{ insert }}: ${{ parameters.EnvVars }} inputs: azureSubscription: ${{ parameters.ServiceConnection }} azurePowerShellVersion: LatestVersion @@ -106,3 +108,4 @@ steps: displayName: Deploy test resources env: TEMP: $(Agent.TempDirectory) + ${{ insert }}: ${{ parameters.EnvVars }} diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 89aa7d825..5009eb53f 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 }}