Skip to content

Commit 80d79fd

Browse files
KathanSKathanS
authored
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
1 parent 6a4f7c4 commit 80d79fd

File tree

15 files changed

+25
-78
lines changed

15 files changed

+25
-78
lines changed

‎Tasks/AzureTestPlanV0/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ export const AUTOMATED_EXECUTION = "AutomatedExecutionPhase";
1313
export const AUTOMATED_PUBLISHING = "PublishingAutomatedResultsPhase";
1414
export const MANUALTESTS_PUBLISHING = "ManualTestResultsPublishingPhase";
1515
export const INSTALL_GOTESTSUM = "install gotest.tools/gotestsum@latest";
16-
export const INSTALL_JESTJUNIT = "i jest-junit";
16+
export const INSTALL_JESTJUNIT = "i jest-junit";
17+
export const MERGE_TEST_RESULTS = true;

‎Tasks/AzureTestPlanV0/publishAutomatedTests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export async function publishAutomatedTestResult(listOfAutomatedTestPoints: stri
2525
try{
2626
const testRunner = "JUnit";
2727
const testResultsFiles: string[] = ["**/TEST-*.xml"];
28-
const mergeResults = tl.getInput('mergeTestResults');
28+
const mergeResults = constants.MERGE_TEST_RESULTS;
2929
const platform = "any cpu";
3030
const publishRunAttachments = tl.getInput('publishRunAttachments');
3131
const failTaskOnFailedTests = tl.getInput('failTaskOnFailedTests');

‎Tasks/AzureTestPlanV0/task.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 250,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"preview": true,
2020
"demands": [],
@@ -102,14 +102,6 @@
102102
"helpMarkDown": "Relative path from the repository root to the build.gradle file.",
103103
"visibleRule": "testLanguageInput = JavaGradle"
104104
},
105-
{
106-
"name": "mergeTestResults",
107-
"type": "boolean",
108-
"label": "Merge test results",
109-
"defaultValue": "false",
110-
"required": false,
111-
"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."
112-
},
113105
{
114106
"name": "publishRunAttachments",
115107
"type": "boolean",

‎Tasks/AzureTestPlanV0/task.loc.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 250,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"preview": true,
2020
"demands": [],
@@ -102,14 +102,6 @@
102102
"helpMarkDown": "ms-resource:loc.input.help.gradleFilePath",
103103
"visibleRule": "testLanguageInput = JavaGradle"
104104
},
105-
{
106-
"name": "mergeTestResults",
107-
"type": "boolean",
108-
"label": "ms-resource:loc.input.label.mergeTestResults",
109-
"defaultValue": "false",
110-
"required": false,
111-
"helpMarkDown": "ms-resource:loc.input.help.mergeTestResults"
112-
},
113105
{
114106
"name": "publishRunAttachments",
115107
"type": "boolean",
@@ -184,9 +176,5 @@
184176
"chmodGradlew": "ms-resource:loc.messages.chmodGradlew",
185177
"NoMatchingFilesFound": "ms-resource:loc.messages.NoMatchingFilesFound",
186178
"MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
187-
},
188-
"_buildConfigMapping": {
189-
"Default": "0.238.4",
190-
"Node20-225": "0.238.5"
191179
}
192180
}

‎_generated/AzureTestPlanV0.versionmap.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|0.250.4
2-
Node20-225|0.250.5
1+
Default|0.250.6
2+
Node20-225|0.250.7

‎_generated/AzureTestPlanV0/Strings/resources.resjson/en-US/resources.resjson

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
"loc.input.help.pomFilePath": "Relative path from the repository root to the Maven POM file.",
1818
"loc.input.label.gradleFilePath": "Gradle file path",
1919
"loc.input.help.gradleFilePath": "Relative path from the repository root to the build.gradle file.",
20-
"loc.input.label.mergeTestResults": "Merge test results",
21-
"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.",
2220
"loc.input.label.publishRunAttachments": "Upload test results files",
2321
"loc.input.help.publishRunAttachments": "Upload logs and other files containing diagnostic information collected when the tests were run.",
2422
"loc.input.label.failTaskOnFailedTests": "Fail if there are test failures",

‎_generated/AzureTestPlanV0/constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ export const AUTOMATED_EXECUTION = "AutomatedExecutionPhase";
1313
export const AUTOMATED_PUBLISHING = "PublishingAutomatedResultsPhase";
1414
export const MANUALTESTS_PUBLISHING = "ManualTestResultsPublishingPhase";
1515
export const INSTALL_GOTESTSUM = "install gotest.tools/gotestsum@latest";
16-
export const INSTALL_JESTJUNIT = "i jest-junit";
16+
export const INSTALL_JESTJUNIT = "i jest-junit";
17+
export const MERGE_TEST_RESULTS = true;

‎_generated/AzureTestPlanV0/publishAutomatedTests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export async function publishAutomatedTestResult(listOfAutomatedTestPoints: stri
2525
try{
2626
const testRunner = "JUnit";
2727
const testResultsFiles: string[] = ["**/TEST-*.xml"];
28-
const mergeResults = tl.getInput('mergeTestResults');
28+
const mergeResults = constants.MERGE_TEST_RESULTS;
2929
const platform = "any cpu";
3030
const publishRunAttachments = tl.getInput('publishRunAttachments');
3131
const failTaskOnFailedTests = tl.getInput('failTaskOnFailedTests');

‎_generated/AzureTestPlanV0/task.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 250,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"preview": true,
2020
"demands": [],
@@ -102,14 +102,6 @@
102102
"helpMarkDown": "Relative path from the repository root to the build.gradle file.",
103103
"visibleRule": "testLanguageInput = JavaGradle"
104104
},
105-
{
106-
"name": "mergeTestResults",
107-
"type": "boolean",
108-
"label": "Merge test results",
109-
"defaultValue": "false",
110-
"required": false,
111-
"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."
112-
},
113105
{
114106
"name": "publishRunAttachments",
115107
"type": "boolean",
@@ -186,8 +178,8 @@
186178
"MultipleMatchingGradlewFound": "Multiple gradlew files found. Selecting the first matched instance"
187179
},
188180
"_buildConfigMapping": {
189-
"Default": "0.250.4",
181+
"Default": "0.250.6",
190182
"LocalPackages": "0.249.4",
191-
"Node20-225": "0.250.5"
183+
"Node20-225": "0.250.7"
192184
}
193185
}

‎_generated/AzureTestPlanV0/task.loc.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 250,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"preview": true,
2020
"demands": [],
@@ -102,14 +102,6 @@
102102
"helpMarkDown": "ms-resource:loc.input.help.gradleFilePath",
103103
"visibleRule": "testLanguageInput = JavaGradle"
104104
},
105-
{
106-
"name": "mergeTestResults",
107-
"type": "boolean",
108-
"label": "ms-resource:loc.input.label.mergeTestResults",
109-
"defaultValue": "false",
110-
"required": false,
111-
"helpMarkDown": "ms-resource:loc.input.help.mergeTestResults"
112-
},
113105
{
114106
"name": "publishRunAttachments",
115107
"type": "boolean",
@@ -186,8 +178,8 @@
186178
"MultipleMatchingGradlewFound": "ms-resource:loc.messages.MultipleMatchingGradlewFound"
187179
},
188180
"_buildConfigMapping": {
189-
"Default": "0.250.4",
181+
"Default": "0.250.6",
190182
"LocalPackages": "0.249.4",
191-
"Node20-225": "0.250.5"
183+
"Node20-225": "0.250.7"
192184
}
193185
}

0 commit comments

Comments
 (0)