From ea14e98bb7b2d77fba344a0c8a1a27d743571fdc Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:22:21 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 9229 (#8152) * Remove default sub config sub-config-azure-cloud-test-resources We no longer want to default the configuration and instead default from the service connection which had the info we need. * Fix quoting --------- Co-authored-by: Wes Haggard --- eng/common/TestResources/build-test-resource-config.yml | 2 +- eng/common/TestResources/deploy-test-resources.yml | 3 +-- eng/common/TestResources/remove-test-resources.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/common/TestResources/build-test-resource-config.yml b/eng/common/TestResources/build-test-resource-config.yml index 25de7ef33..b363f85af 100644 --- a/eng/common/TestResources/build-test-resource-config.yml +++ b/eng/common/TestResources/build-test-resource-config.yml @@ -1,7 +1,7 @@ parameters: - name: SubscriptionConfiguration type: string - default: $(sub-config-azure-cloud-test-resources) + default: '{}' - name: SubscriptionConfigurations type: object default: null diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index 19688919a..22a232d43 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -4,7 +4,7 @@ parameters: DeleteAfterHours: 8 Location: '' EnvVars: {} - SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) + SubscriptionConfiguration: '{}' ServiceConnection: not-specified ResourceType: test UseFederatedAuth: true @@ -36,7 +36,6 @@ parameters: # } # } - steps: - template: /eng/common/pipelines/templates/steps/cache-ps-modules.yml diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 6516de505..611ffc4cf 100644 --- a/eng/common/TestResources/remove-test-resources.yml +++ b/eng/common/TestResources/remove-test-resources.yml @@ -3,7 +3,7 @@ parameters: ServiceDirectory: '' - SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) + SubscriptionConfiguration: $(SubscriptionConfiguration) ServiceConnection: not-specified ResourceType: test EnvVars: {}