|
|
@@ -13,6 +13,7 @@ import cn.seecoder.build.server.service.model.converter.PipelineConverter;
|
|
|
import cn.seecoder.build.server.service.model.converter.TestResultConvertor;
|
|
|
import cn.seecoder.build.server.util.LoggerUtil;
|
|
|
import cn.seecoder.build.server.util.ServiceException;
|
|
|
+import com.alibaba.fastjson2.JSON;
|
|
|
import com.offbytwo.jenkins.model.Artifact;
|
|
|
import com.offbytwo.jenkins.model.BuildWithDetails;
|
|
|
import com.offbytwo.jenkins.model.QueueItem;
|
|
|
@@ -28,6 +29,7 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
+import java.net.URI;
|
|
|
import java.net.URISyntaxException;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -77,6 +79,7 @@ public class JobServiceImpl implements JobService {
|
|
|
buildDetailsVO.setResult(buildWithDetails.getResult());
|
|
|
buildDetailsVO.setTimestamps(buildWithDetails.getTimestamp());
|
|
|
buildDetailsVO.setArtifacts(buildWithDetails.getArtifacts());
|
|
|
+ logger.info(JSON.toJSONString(buildDetailsVO));
|
|
|
fetchBuildResult(buildWithDetails, buildDetailsVO);
|
|
|
return buildDetailsVO;
|
|
|
} catch (IOException | DocumentException | URISyntaxException e) {
|
|
|
@@ -121,9 +124,9 @@ public class JobServiceImpl implements JobService {
|
|
|
}
|
|
|
|
|
|
private void fetchBuildResult(BuildWithDetails buildWithDetails, BuildDetailsVO buildDetailsVO) throws IOException, URISyntaxException, DocumentException {
|
|
|
- TestResult testResult = buildWithDetails.getTestResult();
|
|
|
+ TestResult testResult = buildWithDetails.getClient().get(buildWithDetails.getUrl().replace("build-jenkins.internal-paas.seec.seecoder.cn","environment-9-12.seec.svc.cluster.local:8080") + "/testReport/?depth=1", TestResult.class);;
|
|
|
if (testResult != null) {
|
|
|
- buildDetailsVO.setTestResultVO(TestResultConvertor.convertToVO(buildWithDetails.getTestResult()));
|
|
|
+ buildDetailsVO.setTestResultVO(TestResultConvertor.convertToVO(testResult));
|
|
|
return;
|
|
|
}
|
|
|
CoverageResult coverageResult = buildWithDetails.getClient().get(buildWithDetails.getUrl().replace("build-jenkins.internal-paas.seec.seecoder.cn","environment-9-12.seec.svc.cluster.local:8080") + "/cobertura/?depth=2", CoverageResult.class);
|
|
|
@@ -135,7 +138,10 @@ public class JobServiceImpl implements JobService {
|
|
|
if (artifact != null) {
|
|
|
MutationResult mutationResult = new MutationResult();
|
|
|
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
|
|
- outputStream.write(buildWithDetails.downloadArtifact(artifact));
|
|
|
+ URI uri = new URI(buildWithDetails.getUrl().replace("build-jenkins.internal-paas.seec.seecoder.cn","environment-9-12.seec.svc.cluster.local:8080"));
|
|
|
+ String artifactPath = uri.getPath() + "artifact/" + artifact.getRelativePath();
|
|
|
+ URI artifactUri = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), artifactPath, "", "");
|
|
|
+ outputStream.write(buildWithDetails.getClient().getFile(artifactUri));
|
|
|
String mutationReport = new String(outputStream.toByteArray());
|
|
|
Document document = DocumentHelper.parseText(mutationReport);
|
|
|
Element root = document.getRootElement();
|