The Unified and Autonomous Development Platform
Record and display check error in pull request
Robin Shen9805047fb186
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex 9c107f2d17..aa43aa9382 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -21,7 +21,6 @@ import java.util.concurrent.locks.Lock;import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;-import javax.validation.ValidationException;import org.eclipse.jgit.lib.ObjectId;import org.quartz.CronScheduleBuilder;@@ -171,17 +170,10 @@ public class DefaultJobManager implements JobManager, Runnable, SchedulableTaskbuild.setStatus(Build.Status.WAITING);build.setSubmitter(userManager.getCurrent());- try {- JobParam.validateParamMap(build.getJob().getParamSpecMap(), paramMap);- } catch (ValidationException e) {- String message = String.format("Error validating build parameters (project: %s, commit: %s, job: %s)",- project.getName(), commitId.name(), jobName);- throw new OneException(message, e);- }+ JobParam.validateParamMap(build.getJob().getParamSpecMap(), paramMap);if (!checkedJobNames.add(jobName)) {- String message = String.format("Circular job dependencies found (project: %s, commit: %s, job: %s, dependency loop: %s)",- project.getName(), commitId.name(), jobName, checkedJobNames);+ String message = String.format("Circular job dependencies found (%s)", checkedJobNames);throw new OneException(message);}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 833f2ec6ca..46acd6a876 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -27,6 +27,7 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import javax.validation.ValidationException;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.Permission;@@ -59,11 +60,12 @@ import io.onedev.commons.utils.concurrent.Prioritized;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.ci.CISpec;import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.JobManager;import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.entitymanager.PullRequestBuildManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestBuildManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;@@ -81,10 +83,10 @@ import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.FileChange;import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;@@ -425,31 +427,44 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Overridepublic void check(PullRequest request) {- if (request.isOpen() && request.isValid()) {- if (request.getSourceProject() == null) {- discard(request, "Source project no longer exists");- } else if (request.getSource().getObjectId(false) == null) {- discard(request, "Source branch no longer exists");- } else if (request.getTarget().getObjectId(false) == null) {- discard(request, "Target branch no longer exists");- } else {- checkUpdate(request);- if (request.isMergeIntoTarget()) {- closeAsMerged(request, true);+ try {+ request.setCheckError(null);+ if (request.isOpen() && request.isValid()) {+ if (request.getSourceProject() == null) {+ discard(request, "Source project no longer exists");+ } else if (request.getSource().getObjectId(false) == null) {+ discard(request, "Source branch no longer exists");+ } else if (request.getTarget().getObjectId(false) == null) {+ discard(request, "Target branch no longer exists");} else {- checkQuality(request);-- pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.savePullRequestBuilds(request);-- MergePreview preview = request.getMergePreview();-- if (request.isAllReviewsApproved() && request.isAllBuildsSuccessful()- && preview != null && preview.getMerged() != null) {- merge(request);+ checkUpdate(request);+ if (request.isMergeIntoTarget()) {+ closeAsMerged(request, true);+ } else {+ checkQuality(request);++ pullRequestReviewManager.saveReviews(request);+ pullRequestBuildManager.savePullRequestBuilds(request);++ MergePreview preview = request.getMergePreview();++ if (request.isAllReviewsApproved()+ && request.isAllBuildsSuccessful()+ && request.getCheckError() == null+ && preview != null+ && preview.getMerged() != null) {+ merge(request);+ }}}}+ } catch (ValidationException|OneException e) {+ request.setCheckError(e.getMessage());+ } catch (Exception e) {+ request.setCheckError("Error checking pull request, check server log for details");+ String message = String.format("Error checking pull request (project: %s, number: %d)",+ request.getTargetProject().getName(), request.getNumber());+ logger.error(message, e);}}@@ -547,15 +562,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestCriterion criterion = Restrictions.and(ofOpen(),Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));- for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion))) {- try {+ for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion)))check(request);- } catch (Exception e) {- String message = String.format("Error checking pull request (project: %s, number: %d)",- request.getTargetProject().getName(), request.getNumber());- logger.error(message, e);- }- }}}@@ -664,10 +672,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequesttry {ThreadContext.bind(subject);check(load(requestId));- } catch (Exception e) {- String message = String.format("Error checking pull request (project: %s, number: %d)",- request.getTargetProject().getName(), request.getNumber());- logger.error(message, e);} finally {ThreadContext.unbindSubject();}@@ -718,14 +722,20 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.getPullRequestBuilds().clear();MergePreview preview = request.getMergePreview();if (preview != null && preview.getMerged() != null) {+ Project project = request.getTargetProject();+ ObjectId commitId = ObjectId.fromString(preview.getMerged());+ CISpec ciSpec = project.getCISpec(commitId);+ if (ciSpec == null)+ throw new OneException("No CI spec defined in merge preview commit");for (JobDependency dependency: jobDependencies) {+ if (!ciSpec.getJobMap().containsKey(dependency.getJobName()))+ throw new OneException("Job '" + dependency.getJobName() + "' is not defined in merge preview commit");new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {Build build = jobManager.submit(request.getTargetProject(),- ObjectId.fromString(preview.getMerged()),- dependency.getJobName(), paramMap);+ commitId, dependency.getJobName(), paramMap);PullRequestBuild pullRequestBuild = null;for (PullRequestBuild prevRequirement: prevRequirements) {if (prevRequirement.getBuild().equals(build)) {diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 995bbbb7bf..354cafc7cf 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -75,7 +75,7 @@ public class Build extends AbstractEntity implements Referenceable {public static final String STATUS = "status";- private static final int MAX_STATUS_MESSAGE = 1024;+ private static final int MAX_STATUS_MESSAGE_LEN = 1024;public enum Status {// Most significant status comes first, refer to getOverallStatus@@ -132,7 +132,7 @@ public class Build extends AbstractEntity implements Referenceable {private Date finishDate;- @Column(length=MAX_STATUS_MESSAGE)+ @Column(length=MAX_STATUS_MESSAGE_LEN)private String statusMessage;@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)@@ -320,7 +320,7 @@ public class Build extends AbstractEntity implements Referenceable {public void setStatusMessage(String statusMessage) {if (statusMessage != null) {- statusMessage = StringUtils.abbreviate(statusMessage, MAX_STATUS_MESSAGE);+ statusMessage = StringUtils.abbreviate(statusMessage, MAX_STATUS_MESSAGE_LEN);for (String secretValue: getSecretValuesToMask())statusMessage = StringUtils.replace(statusMessage, secretValue, SecretInput.MASK);}diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex ed6f182603..9bd3c7a38c 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -81,6 +81,8 @@ import io.onedev.server.util.jackson.RestView;public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {private static final long serialVersionUID = 1L;++ private static final int MAX_CHECK_ERROR_LEN = 1024;@Embeddedprivate CloseInfo closeInfo;@@ -183,6 +185,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient Collection<Issue> fixedIssues;+ @Column(length=MAX_CHECK_ERROR_LEN)+ private String checkError;+/*** Get title of this merge request.*@@ -657,6 +662,17 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.updateDate = updateDate;}+ @Nullable+ public String getCheckError() {+ return checkError;+ }++ public void setCheckError(@Nullable String checkError) {+ if (checkError != null)+ checkError = StringUtils.abbreviate(checkError, MAX_CHECK_ERROR_LEN);+ this.checkError = checkError;+ }+public Date getLastCodeCommentActivityDate() {return lastCodeCommentActivityDate;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 4af7a86881..11c3971c98 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -23,6 +23,7 @@<a wicket:id="moreInfo" class="more-info" title="More info"><span class="fa fa-ellipsis-h"></span></a></div><div wicket:id="requestSummary" class="summary">+ <div wicket:id="checkError" class="alert alert-danger"></div><div wicket:id="discardedNote" class="discarded alert alert-danger"><i class="fa fa-info-circle"></i> This pull request has been discarded.</div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 6181fc751d..73bcf08c22 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -334,7 +334,33 @@ public abstract class PullRequestDetailPage extends ProjectPage {summaryContainer.setOutputMarkupPlaceholderTag(true);add(summaryContainer);- summaryContainer.add(newDiscardedNoteContainer());+ summaryContainer.add(new Label("checkError", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getPullRequest().getCheckError();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().getCheckError() != null);+ }++ }.setOutputMarkupPlaceholderTag(true));++ summaryContainer.add(new WebMarkupContainer("discardedNote") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isDiscarded());+ }++ }.setOutputMarkupPlaceholderTag(true));+summaryContainer.add(newMergedNoteContainer());summaryContainer.add(newMergeStatusContainer());summaryContainer.add(new WebMarkupContainer("doNotMerge") {@@ -620,7 +646,8 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overridepublic void onClick() {getPullRequestManager().check(getPullRequest());- Session.get().success("Pull request is synchronized");+ if (getPullRequest().getCheckError() == null)+ Session.get().success("Pull request is synchronized");}});@@ -1144,20 +1171,6 @@ public abstract class PullRequestDetailPage extends ProjectPage {return fragment;}- private WebMarkupContainer newDiscardedNoteContainer() {- WebMarkupContainer discardedNoteContainer = new WebMarkupContainer("discardedNote") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().isDiscarded());- }-- };- discardedNoteContainer.setOutputMarkupPlaceholderTag(true);- return discardedNoteContainer;- }-private String getOperationName(PullRequestOperation operation) {return WordUtils.capitalizeFully(operation.name()).replace("_", " ").toLowerCase();}