Set Merge Test Results to true by default (#20718)

* merge test results to true. * revert package lock * revert make options. * Update package-lock.json * Update .npmrc * version bump
microsoft · Dec 13, 2024 · 80d79fd · 80d79fd
1 parent 6a4f7c4
commit 80d79fd
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 78 deletions.
diff --git a/Tasks/AzureTestPlanV0/constants.ts b/Tasks/AzureTestPlanV0/constants.ts
@@ -13,4 +13,5 @@ export const AUTOMATED_EXECUTION = "AutomatedExecutionPhase";
 export const AUTOMATED_PUBLISHING = "PublishingAutomatedResultsPhase";
 export const MANUALTESTS_PUBLISHING = "ManualTestResultsPublishingPhase";
 export const INSTALL_GOTESTSUM = "install gotest.tools/gotestsum@latest";
-export const INSTALL_JESTJUNIT = "i jest-junit";
+export const INSTALL_JESTJUNIT = "i jest-junit";
+export const MERGE_TEST_RESULTS = true;
diff --git a/Tasks/AzureTestPlanV0/publishAutomatedTests.ts b/Tasks/AzureTestPlanV0/publishAutomatedTests.ts
@@ -25,7 +25,7 @@ export async function publishAutomatedTestResult(listOfAutomatedTestPoints: stri
     try{
         const testRunner = "JUnit";
         const testResultsFiles: string[] = ["**/TEST-*.xml"];
-        const mergeResults = tl.getInput('mergeTestResults');
+        const mergeResults = constants.MERGE_TEST_RESULTS;
         const platform = "any cpu";
         const publishRunAttachments = tl.getInput('publishRunAttachments');
         const failTaskOnFailedTests = tl.getInput('failTaskOnFailedTests');

diff --git a/Tasks/AzureTestPlanV0/task.json b/Tasks/AzureTestPlanV0/task.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 4
+    "Patch": 6
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "Relative path from the repository root to the build.gradle file.",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "Merge test results",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "A test run is created for each results file. Check this option to merge results into a single test run. To optimize for better performance, results will be merged into a single run if there are more than 100 result files, irrespective of this option."
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",

diff --git a/Tasks/AzureTestPlanV0/task.loc.json b/Tasks/AzureTestPlanV0/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 4
+    "Patch": 6
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "ms-resource:loc.input.help.gradleFilePath",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.mergeTestResults",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.mergeTestResults"
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",
@@ -184,9 +176,5 @@
     "chmodGradlew": "ms-resource:loc.messages.chmodGradlew",
     "NoMatchingFilesFound": "ms-resource:loc.messages.NoMatchingFilesFound",
     "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
-  },
-  "_buildConfigMapping": {
-    "Default": "0.238.4",
-    "Node20-225": "0.238.5"
   }
 }
diff --git a/_generated/AzureTestPlanV0.versionmap.txt b/_generated/AzureTestPlanV0.versionmap.txt
@@ -1,2 +1,2 @@
-Default|0.250.4
-Node20-225|0.250.5
+Default|0.250.6
+Node20-225|0.250.7
diff --git a/_generated/AzureTestPlanV0/Strings/resources.resjson/en-US/resources.resjson b/_generated/AzureTestPlanV0/Strings/resources.resjson/en-US/resources.resjson
@@ -17,8 +17,6 @@
   "loc.input.help.pomFilePath": "Relative path from the repository root to the Maven POM file.",
   "loc.input.label.gradleFilePath": "Gradle file path",
   "loc.input.help.gradleFilePath": "Relative path from the repository root to the build.gradle file.",
-  "loc.input.label.mergeTestResults": "Merge test results",
-  "loc.input.help.mergeTestResults": "A test run is created for each results file. Check this option to merge results into a single test run. To optimize for better performance, results will be merged into a single run if there are more than 100 result files, irrespective of this option.",
   "loc.input.label.publishRunAttachments": "Upload test results files",
   "loc.input.help.publishRunAttachments": "Upload logs and other files containing diagnostic information collected when the tests were run.",
   "loc.input.label.failTaskOnFailedTests": "Fail if there are test failures",

diff --git a/_generated/AzureTestPlanV0/constants.ts b/_generated/AzureTestPlanV0/constants.ts
@@ -13,4 +13,5 @@ export const AUTOMATED_EXECUTION = "AutomatedExecutionPhase";
 export const AUTOMATED_PUBLISHING = "PublishingAutomatedResultsPhase";
 export const MANUALTESTS_PUBLISHING = "ManualTestResultsPublishingPhase";
 export const INSTALL_GOTESTSUM = "install gotest.tools/gotestsum@latest";
-export const INSTALL_JESTJUNIT = "i jest-junit";
+export const INSTALL_JESTJUNIT = "i jest-junit";
+export const MERGE_TEST_RESULTS = true;
diff --git a/_generated/AzureTestPlanV0/publishAutomatedTests.ts b/_generated/AzureTestPlanV0/publishAutomatedTests.ts
@@ -25,7 +25,7 @@ export async function publishAutomatedTestResult(listOfAutomatedTestPoints: stri
     try{
         const testRunner = "JUnit";
         const testResultsFiles: string[] = ["**/TEST-*.xml"];
-        const mergeResults = tl.getInput('mergeTestResults');
+        const mergeResults = constants.MERGE_TEST_RESULTS;
         const platform = "any cpu";
         const publishRunAttachments = tl.getInput('publishRunAttachments');
         const failTaskOnFailedTests = tl.getInput('failTaskOnFailedTests');

diff --git a/_generated/AzureTestPlanV0/task.json b/_generated/AzureTestPlanV0/task.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 4
+    "Patch": 6
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "Relative path from the repository root to the build.gradle file.",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "Merge test results",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "A test run is created for each results file. Check this option to merge results into a single test run. To optimize for better performance, results will be merged into a single run if there are more than 100 result files, irrespective of this option."
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",
@@ -186,8 +178,8 @@
     "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.4",
+    "Default": "0.250.6",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.5"
+    "Node20-225": "0.250.7"
   }
 }
diff --git a/_generated/AzureTestPlanV0/task.loc.json b/_generated/AzureTestPlanV0/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 4
+    "Patch": 6
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "ms-resource:loc.input.help.gradleFilePath",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.mergeTestResults",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.mergeTestResults"
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",
@@ -186,8 +178,8 @@
     "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.4",
+    "Default": "0.250.6",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.5"
+    "Node20-225": "0.250.7"
   }
 }
diff --git a/_generated/AzureTestPlanV0_Node20/Strings/resources.resjson/en-US/resources.resjson b/_generated/AzureTestPlanV0_Node20/Strings/resources.resjson/en-US/resources.resjson
@@ -17,8 +17,6 @@
   "loc.input.help.pomFilePath": "Relative path from the repository root to the Maven POM file.",
   "loc.input.label.gradleFilePath": "Gradle file path",
   "loc.input.help.gradleFilePath": "Relative path from the repository root to the build.gradle file.",
-  "loc.input.label.mergeTestResults": "Merge test results",
-  "loc.input.help.mergeTestResults": "A test run is created for each results file. Check this option to merge results into a single test run. To optimize for better performance, results will be merged into a single run if there are more than 100 result files, irrespective of this option.",
   "loc.input.label.publishRunAttachments": "Upload test results files",
   "loc.input.help.publishRunAttachments": "Upload logs and other files containing diagnostic information collected when the tests were run.",
   "loc.input.label.failTaskOnFailedTests": "Fail if there are test failures",

diff --git a/_generated/AzureTestPlanV0_Node20/constants.ts b/_generated/AzureTestPlanV0_Node20/constants.ts
@@ -13,4 +13,5 @@ export const AUTOMATED_EXECUTION = "AutomatedExecutionPhase";
 export const AUTOMATED_PUBLISHING = "PublishingAutomatedResultsPhase";
 export const MANUALTESTS_PUBLISHING = "ManualTestResultsPublishingPhase";
 export const INSTALL_GOTESTSUM = "install gotest.tools/gotestsum@latest";
-export const INSTALL_JESTJUNIT = "i jest-junit";
+export const INSTALL_JESTJUNIT = "i jest-junit";
+export const MERGE_TEST_RESULTS = true;
diff --git a/_generated/AzureTestPlanV0_Node20/publishAutomatedTests.ts b/_generated/AzureTestPlanV0_Node20/publishAutomatedTests.ts
@@ -25,7 +25,7 @@ export async function publishAutomatedTestResult(listOfAutomatedTestPoints: stri
     try{
         const testRunner = "JUnit";
         const testResultsFiles: string[] = ["**/TEST-*.xml"];
-        const mergeResults = tl.getInput('mergeTestResults');
+        const mergeResults = constants.MERGE_TEST_RESULTS;
         const platform = "any cpu";
         const publishRunAttachments = tl.getInput('publishRunAttachments');
         const failTaskOnFailedTests = tl.getInput('failTaskOnFailedTests');

diff --git a/_generated/AzureTestPlanV0_Node20/task.json b/_generated/AzureTestPlanV0_Node20/task.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 5
+    "Patch": 7
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "Relative path from the repository root to the build.gradle file.",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "Merge test results",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "A test run is created for each results file. Check this option to merge results into a single test run. To optimize for better performance, results will be merged into a single run if there are more than 100 result files, irrespective of this option."
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",
@@ -190,8 +182,8 @@
     "MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.4",
+    "Default": "0.250.6",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.5"
+    "Node20-225": "0.250.7"
   }
 }
diff --git a/_generated/AzureTestPlanV0_Node20/task.loc.json b/_generated/AzureTestPlanV0_Node20/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 250,
-    "Patch": 5
+    "Patch": 7
   },
   "preview": true,
   "demands": [],
@@ -102,14 +102,6 @@
       "helpMarkDown": "ms-resource:loc.input.help.gradleFilePath",
       "visibleRule": "testLanguageInput = JavaGradle"
     },
-    {
-      "name": "mergeTestResults",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.mergeTestResults",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.mergeTestResults"
-    },
     {
       "name": "publishRunAttachments",
       "type": "boolean",
@@ -190,8 +182,8 @@
     "MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
   },
   "_buildConfigMapping": {
-    "Default": "0.250.4",
+    "Default": "0.250.6",
     "LocalPackages": "0.249.4",
-    "Node20-225": "0.250.5"
+    "Node20-225": "0.250.7"
   }
 }