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

fix(jenkins): 修复jenkins执行场景没有发送通知的问题 

--bug=1008340 --user=刘瑞斌 【jenkins插件】通知问题汇总 https://www.tapd.cn/55049933/s/1075016
This commit is contained in:
CaptainB 2021-11-25 12:30:25 +08:00 committed by 刘瑞斌
parent 12a3551c8d
commit bc80ce7cbe
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/service/TestResultService.java
View File

@ -72,6 +72,7 @@ public class TestResultService {
reportTask.setTriggerMode(TriggerMode.API.name()); reportTask.setTriggerMode(TriggerMode.API.name());
reportTask.setName(apiTestCaseWithBLOBs.getName()); reportTask.setName(apiTestCaseWithBLOBs.getName());
reportTask.setExecutor(userName); reportTask.setExecutor(userName);
reportTask.setUserId(apiTestCaseWithBLOBs.getCreateUserId());
reportTask.setExecutionTime(DateUtils.getTimeString(apiTestCaseWithBLOBs.getCreateTime())); reportTask.setExecutionTime(DateUtils.getTimeString(apiTestCaseWithBLOBs.getCreateTime()));
reportTask.setEnvironment(name); reportTask.setEnvironment(name);
//测试计划用例，定时，jenkins //测试计划用例，定时，jenkins
@ -105,18 +106,17 @@ public class TestResultService {
} }
//报告内容 //报告内容
reportTask = new ApiTestReportVariable(); reportTask = new ApiTestReportVariable();
if (StringUtils.equalsAny(runMode, ApiRunMode.SCHEDULE_SCENARIO.name())) {
reportTask.setStatus(scenarioReport.getStatus()); reportTask.setStatus(scenarioReport.getStatus());
reportTask.setId(scenarioReport.getId()); reportTask.setId(scenarioReport.getId());
reportTask.setTriggerMode(scenarioReport.getTriggerMode()); reportTask.setTriggerMode(scenarioReport.getTriggerMode());
reportTask.setName(scenarioReport.getName()); reportTask.setName(scenarioReport.getName());
reportTask.setExecutor(userName); reportTask.setExecutor(userName);
reportTask.setUserId(scenarioReport.getUserId());
reportTask.setPrincipal(principal); reportTask.setPrincipal(principal);
reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime())); reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime()));
reportTask.setEnvironment(environment); reportTask.setEnvironment(environment);
SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class); SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
assert systemParameterService != null; assert systemParameterService != null;
}
testResult.setTestId(scenarioReport.getScenarioId()); testResult.setTestId(scenarioReport.getScenarioId());
planScenarioId = scenarioReport.getTestPlanScenarioId(); planScenarioId = scenarioReport.getTestPlanScenarioId();
} }

9
frontend/src/business/components/notice/util.js
View File

@ -50,6 +50,15 @@ export function getResource(d) {
switch (d.resourceType) { switch (d.resourceType) {
case "JENKINS_TASK" : case "JENKINS_TASK" :
resourceType = "Jenkins"; resourceType = "Jenkins";
if (d.operation === 'EXECUTE_SUCCESSFUL') {
resourceType = "Jenkins 成功";
}
if (d.operation === 'EXECUTE_FAILED') {
resourceType = "Jenkins 失败";
}
if (d.operation === 'EXECUTE_COMPLETED') {
resourceType = "Jenkins 完成";
}
break; break;
case "TEST_PLAN_TASK" : case "TEST_PLAN_TASK" :
resourceType = "测试计划"; resourceType = "测试计划";