From f9e091ce76c325df18b332ef782ce481b8e21e9a Mon Sep 17 00:00:00 2001 From: Shawn Fang <45607042+mssfang@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:33:25 -0700 Subject: [PATCH 1/4] enable JDK and Vertx --- .../templates/stages/platform-matrix.json | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 6f9382bc1d21..abc034020f94 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -9,7 +9,7 @@ "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, "JavaTestVersion": [ "1.8", "1.17" ], - "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ], + "AZURE_TEST_HTTP_CLIENTS": [ "jdk-httpclient", "vertx", "okhttp", "netty" ], "TestFromSource": false, "RunAggregateReports": false, "TestGoals": "surefire:test", @@ -54,6 +54,39 @@ "RunAggregateReports": false, "TestGoals": "surefire:test", "TestOptions": "" + }, + { + "Agent": { + "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } + }, + "JavaTestVersion": "1.17", + "AZURE_TEST_HTTP_CLIENTS": "jdk", + "TestFromSource": true, + "RunAggregateReports": false, + "TestGoals": "verify", + "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false" + }, + { + "Agent": { + "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } + }, + "JavaTestVersion": "1.17", + "AZURE_TEST_HTTP_CLIENTS": "jdk", + "TestFromSource": false, + "RunAggregateReports": true, + "TestGoals": "verify", + "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false" + }, + { + "Agent": { + "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } + }, + "JavaTestVersion": "1.17", + "AZURE_TEST_HTTP_CLIENTS": "jdk", + "TestFromSource": false, + "RunAggregateReports": false, + "TestGoals": "surefire:test", + "TestOptions": "" } ] } From 636a90ff4d716571d91c175992095a168fb9386b Mon Sep 17 00:00:00 2001 From: Shawn Fang <45607042+mssfang@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:42:13 -0700 Subject: [PATCH 2/4] align names --- eng/pipelines/templates/stages/platform-matrix.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index abc034020f94..3fa5f036b882 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -60,7 +60,7 @@ "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } }, "JavaTestVersion": "1.17", - "AZURE_TEST_HTTP_CLIENTS": "jdk", + "AZURE_TEST_HTTP_CLIENTS": "jdk-httpclient", "TestFromSource": true, "RunAggregateReports": false, "TestGoals": "verify", @@ -71,7 +71,7 @@ "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } }, "JavaTestVersion": "1.17", - "AZURE_TEST_HTTP_CLIENTS": "jdk", + "AZURE_TEST_HTTP_CLIENTS": "jdk-httpclient", "TestFromSource": false, "RunAggregateReports": true, "TestGoals": "verify", @@ -82,7 +82,7 @@ "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } }, "JavaTestVersion": "1.17", - "AZURE_TEST_HTTP_CLIENTS": "jdk", + "AZURE_TEST_HTTP_CLIENTS": "jdk-httpclient", "TestFromSource": false, "RunAggregateReports": false, "TestGoals": "surefire:test", From c706428e4d63ace357c2fb8fbf63fa9a4897f5d3 Mon Sep 17 00:00:00 2001 From: Shawn Fang <45607042+mssfang@users.noreply.github.com> Date: Tue, 2 May 2023 14:30:27 -0700 Subject: [PATCH 3/4] reduce testing agents --- eng/pipelines/templates/stages/platform-matrix.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 3fa5f036b882..f5c27c3f9e14 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -9,7 +9,7 @@ "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } }, "JavaTestVersion": [ "1.8", "1.17" ], - "AZURE_TEST_HTTP_CLIENTS": [ "jdk-httpclient", "vertx", "okhttp", "netty" ], + "AZURE_TEST_HTTP_CLIENTS": ["vertx", "okhttp", "netty" ], "TestFromSource": false, "RunAggregateReports": false, "TestGoals": "surefire:test", @@ -55,17 +55,6 @@ "TestGoals": "surefire:test", "TestOptions": "" }, - { - "Agent": { - "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } - }, - "JavaTestVersion": "1.17", - "AZURE_TEST_HTTP_CLIENTS": "jdk-httpclient", - "TestFromSource": true, - "RunAggregateReports": false, - "TestGoals": "verify", - "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false" - }, { "Agent": { "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } From 2bd9ef1f153b8bef83aed4464b7713504e8962c5 Mon Sep 17 00:00:00 2001 From: Shawn Fang <45607042+mssfang@users.noreply.github.com> Date: Fri, 5 May 2023 11:24:19 -0700 Subject: [PATCH 4/4] remove windows agent to save cost --- eng/pipelines/templates/stages/platform-matrix.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index f5c27c3f9e14..ff965915b358 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -55,17 +55,6 @@ "TestGoals": "surefire:test", "TestOptions": "" }, - { - "Agent": { - "windows-2022": { "OSVmImage": "windows-2022", "Pool": "azsdk-pool-mms-win-2022-general" } - }, - "JavaTestVersion": "1.17", - "AZURE_TEST_HTTP_CLIENTS": "jdk-httpclient", - "TestFromSource": false, - "RunAggregateReports": true, - "TestGoals": "verify", - "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false" - }, { "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }