From 5d51156238066812691703c3627dd04d80e7c58b Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Fri, 18 Sep 2020 12:41:16 -0700 Subject: [PATCH 1/4] canary support for live tests --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 9 +++++++++ sdk/eventhub/tests.yml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index e02af4375a399..4edcec161cea6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -26,6 +26,9 @@ parameters: - name: SubscriptionConfiguration type: string default: $(sub-config-azure-cloud-test-resources) +- name: TestCanary + type: boolean + default: false - name: ServiceDirectory type: string default: not-specified @@ -65,6 +68,12 @@ jobs: - DisplayName: "Test on MacOS" OSVmImage: "macOS-10.15" TestTargetFramework: netcoreapp2.1 + ${{ if eq(parameters.TestCanary, 'true') }}: + - DisplayName: "Test on Windows for .Net Framework - Canary region" + OSVmImage: "windows-2019" + TestTargetFramework: net461 + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) + Location: centraluseuap - DisplayName: "Record on Windows for NetCoreApp" OSVmImage: "windows-2019" TestMode: Record diff --git a/sdk/eventhub/tests.yml b/sdk/eventhub/tests.yml index b2009cd2c5d78..d2f1707c1c9d5 100644 --- a/sdk/eventhub/tests.yml +++ b/sdk/eventhub/tests.yml @@ -5,4 +5,5 @@ extends: parameters: MaxParallel: 6 ServiceDirectory: eventhub - TimeoutInMinutes: 120 \ No newline at end of file + TimeoutInMinutes: 120 + TestCanary: true \ No newline at end of file From 092d5ebac0de02e761e4ede08703b433c00e08d3 Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Fri, 18 Sep 2020 12:45:36 -0700 Subject: [PATCH 2/4] Add - before if-block --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index 4edcec161cea6..18601f1ceb77f 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -68,7 +68,7 @@ jobs: - DisplayName: "Test on MacOS" OSVmImage: "macOS-10.15" TestTargetFramework: netcoreapp2.1 - ${{ if eq(parameters.TestCanary, 'true') }}: + - ${{ if eq(parameters.TestCanary, 'true') }}: - DisplayName: "Test on Windows for .Net Framework - Canary region" OSVmImage: "windows-2019" TestTargetFramework: net461 From 73b921e2b15e364796629600381ec3f228cc553c Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Fri, 25 Sep 2020 11:55:21 -0700 Subject: [PATCH 3/4] add ResourceGroupLocationCanary variable for canary location --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index 18601f1ceb77f..46fa4be87a111 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -29,6 +29,9 @@ parameters: - name: TestCanary type: boolean default: false +- name: ResourceGroupLocationCanary + type: string + default: "centraluseuap" - name: ServiceDirectory type: string default: not-specified @@ -73,7 +76,7 @@ jobs: OSVmImage: "windows-2019" TestTargetFramework: net461 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) - Location: centraluseuap + Location: ${{ parameters.ResourceGroupLocationCanary }} - DisplayName: "Record on Windows for NetCoreApp" OSVmImage: "windows-2019" TestMode: Record From b1b504804845373fe699e789e3eb3c5d26847e47 Mon Sep 17 00:00:00 2001 From: HarshaNalluru Date: Fri, 25 Sep 2020 17:35:19 -0700 Subject: [PATCH 4/4] netcoreapp instead --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index 46fa4be87a111..54be31596e6e6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -72,9 +72,9 @@ jobs: OSVmImage: "macOS-10.15" TestTargetFramework: netcoreapp2.1 - ${{ if eq(parameters.TestCanary, 'true') }}: - - DisplayName: "Test on Windows for .Net Framework - Canary region" + - DisplayName: "Test on Windows for NetCoreApp - Canary region" OSVmImage: "windows-2019" - TestTargetFramework: net461 + TestTargetFramework: netcoreapp2.1 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) Location: ${{ parameters.ResourceGroupLocationCanary }} - DisplayName: "Record on Windows for NetCoreApp"