From 89ff6393ff1a9cb3f2fa7f8bee4a527326a3a57e Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Mon, 18 May 2020 12:04:02 -0700 Subject: [PATCH 1/3] set global SubscriptionConfiguration --- sdk/cosmos/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index 9ed20d8a1242..f1fc8294e690 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -4,6 +4,9 @@ variables: - template: ../../eng/pipelines/templates/variables/globals.yml - name: AdditionalArgs value: '' + # Setting a global $(SubscriptionConfiguration) for Cosmos + - name: SubscriptionConfiguration + value: '' jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml From 3e81677a023451ee775281c744edafa554b8f32f Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Mon, 18 May 2020 12:11:16 -0700 Subject: [PATCH 2/3] add default value to $(SubscriptionConfiguration) --- sdk/cosmos/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index f1fc8294e690..d4b1d8384970 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -6,7 +6,7 @@ variables: value: '' # Setting a global $(SubscriptionConfiguration) for Cosmos - name: SubscriptionConfiguration - value: '' + value: $(sub-config-azure-cloud-test-resources) jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml From 3acccfb82bc5197c11b4790783dd111b6331dccb Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Mon, 18 May 2020 12:30:34 -0700 Subject: [PATCH 3/3] set $(SubscriptionConfiguration) at the template job's level --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 4 ++++ sdk/cosmos/tests.yml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index e12e4720d58a..a7d5e27b2458 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -61,6 +61,10 @@ jobs: variables: - template: ../variables/globals.yml + # Default $(SubscriptionConfiguration) if the matrix does not specify a $(SubscriptionConfiguration) + - name: SubscriptionConfiguration + value: $(sub-config-azure-cloud-test-resources) + strategy: matrix: ${{ parameters.Matrix }} maxParallel: ${{ parameters.MaxParallel }} diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index d4b1d8384970..9ed20d8a1242 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -4,9 +4,6 @@ variables: - template: ../../eng/pipelines/templates/variables/globals.yml - name: AdditionalArgs value: '' - # Setting a global $(SubscriptionConfiguration) for Cosmos - - name: SubscriptionConfiguration - value: $(sub-config-azure-cloud-test-resources) jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-tests.yml