test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(Jenkins执行一直running #1005282): 修改Jenkins调用参数-失败是否停止-为false，解决Jenkins调用一直running的问题 

--bug=1005282 --user=宋天阳 【jenkins插件】执行方式选测试计划，问题汇总
https://www.tapd.cn/55049933/s/1033599
This commit is contained in:
song-tianyang 2021-08-09 17:17:50 +08:00 committed by 刘瑞斌
parent b29ba907e9
commit 69712bfb27
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
View File

@ -156,7 +156,7 @@ public class TestPlanController {
ApiRunConfigDTO api = new ApiRunConfigDTO(); ApiRunConfigDTO api = new ApiRunConfigDTO();
api.setMode(testplanRunRequest.getMode()); api.setMode(testplanRunRequest.getMode());
api.setResourcePoolId(testplanRunRequest.getResourcePoolId()); api.setResourcePoolId(testplanRunRequest.getResourcePoolId());
api.setOnSampleError(true); api.setOnSampleError(false);
api.setReportType("iddReport"); api.setReportType("iddReport");
String apiRunConfig = JSONObject.toJSONString(api); String apiRunConfig = JSONObject.toJSONString(api);
return testPlanService.run(testplanRunRequest.getTestPlanId(), testplanRunRequest.getProjectId(), testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), apiRunConfig); return testPlanService.run(testplanRunRequest.getTestPlanId(), testplanRunRequest.getProjectId(), testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), apiRunConfig);

2
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -1144,7 +1144,7 @@ public class TestPlanReportService {
public synchronized TestPlanReport updateExecuteApis(String planReportId, Map<String, String> executeApiCaseIdMap, Map<String, String> executeScenarioCaseIdMap, Map<String, String> executePerformanceIdMap) { public synchronized TestPlanReport updateExecuteApis(String planReportId, Map<String, String> executeApiCaseIdMap, Map<String, String> executeScenarioCaseIdMap, Map<String, String> executePerformanceIdMap) {
TestPlanReportDataExample example = new TestPlanReportDataExample(); TestPlanReportDataExample example = new TestPlanReportDataExample();
List<String> resourceIdList = new ArrayList<>(); // List<String> resourceIdList = new ArrayList<>();
if(executeApiCaseIdMap == null){ if(executeApiCaseIdMap == null){
executeApiCaseIdMap = new HashMap<>(); executeApiCaseIdMap = new HashMap<>();
} }

2
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -1019,7 +1019,7 @@ public class TestPlanService {
String planReportId = testPlanReport.getId(); String planReportId = testPlanReport.getId();
testPlanLog.info("ReportId[" + planReportId + "] created. TestPlanID:[" + testPlanID + "]. "); testPlanLog.info("ReportId[" + planReportId + "] created. TestPlanID:[" + testPlanID + "]. "+"API Run Config:【"+apiRunConfig+"】");
//不同任务的执行ID //不同任务的执行ID
Map<String, String> executePerformanceIdMap = new HashMap<>(); Map<String, String> executePerformanceIdMap = new HashMap<>();