Skip to content

The Unified and Autonomous Development Platform

Fix issue #531 - Each firing of cron trigger should generate a new build

Robin Shen2f10e71588b6
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 5a4f4eff6e..84f35ee221 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -217,7 +217,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Transactional
@Override
public Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, SubmitReason reason) {
+ Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason) {
Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
transactionManager.mustRunAfterTransaction(new Runnable() {
@@ -248,7 +248,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
project.getPath(), commitId.name(), jobName));
}
- return doSubmit(project, commitId, jobName, paramMap, reason);
+ return doSubmit(project, commitId, jobName, paramMap, triggerChain, reason);
} catch (Throwable e) {
throw ExceptionUtils.unchecked(e);
} finally {
@@ -257,7 +257,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private Build doSubmit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, SubmitReason reason) {
+ Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason) {
ScriptIdentity.push(new JobIdentity(project, commitId));
try {
Build build = new Build();
@@ -270,6 +270,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setSubmitter(SecurityUtils.getUser());
build.setRefName(reason.getRefName());
build.setRequest(reason.getPullRequest());
+ build.setTriggerChain(triggerChain);
ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
@@ -281,7 +282,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Collection<Build> builds = buildManager.query(project, commitId, jobName,
reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),
- paramMapToQuery);
+ paramMapToQuery, triggerChain);
if (builds.isEmpty()) {
Long projectId = project.getId();
@@ -339,7 +340,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run(Map<String, List<String>> paramMap) {
Build dependencyBuild = doSubmit(project, commitId,
- interpolated.getJobName(), paramMap, reason);
+ interpolated.getJobName(), paramMap, triggerChain, reason);
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
@@ -828,12 +829,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ThreadContext.bind(userManager.getSystem().asSubject());
Project project = projectManager.load(projectId);
+ String triggerChain = UUID.randomUUID().toString();
try {
new MatrixRunner<List<String>>(paramMatrix) {
@Override
public void run(Map<String, List<String>> paramMap) {
- submit(project, commitId, job.getName(), paramMap, match.getReason());
+ submit(project, commitId, job.getName(), paramMap,
+ triggerChain, match.getReason());
}
}.run();
@@ -1085,13 +1088,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
ThreadContext.bind(userManager.getSystem().asSubject());
-
+
Project project = projectManager.load(projectId);
+ String triggerChain = UUID.randomUUID().toString();
new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, trigger.getParams())) {
@Override
public void run(Map<String, List<String>> paramMap) {
- Build build = submit(project, commitId, job.getName(), paramMap, reason);
+ Build build = submit(project, commitId, job.getName(), paramMap, triggerChain, reason);
if (build.isFinished())
resubmit(build, paramMap, "Resubmitted by schedule");
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
index f206f66c8d..3f2392bab0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
@@ -19,7 +19,7 @@ public interface JobManager {
void schedule(Project project);
Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, SubmitReason reason);
+ Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason);
void resubmit(Build build, Map<String, List<String>> paramMap, String reason);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
index 97cf84cd28..3840cd3f2d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
@@ -115,7 +115,7 @@ public class RunJobAction extends PostBuildAction {
};
JobManager jobManager = OneDev.getInstance(JobManager.class);
jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),
- paramMap, reason);
+ paramMap, build.getTriggerChain(), reason);
}
}.run();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 0af71d8f80..bb2deddbf0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -41,11 +41,12 @@ public interface BuildManager extends EntityManager<Build> {
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
@Nullable String refName, @Nullable Optional<PullRequest> request,
- Map<String, List<String>> params);
+ Map<String, List<String>> params, @Nullable String triggerChain);
- Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);
+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
+ @Nullable String triggerChain);
- Collection<Build> query(Project project, ObjectId commitId);
+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String triggerChain);
Map<ObjectId, Map<String, Collection<StatusInfo>>> queryStatus(Project project, Collection<ObjectId> commitIds);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 49b4ded240..2b07bf66d0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -263,20 +263,21 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Sessional
@Override
- public Collection<Build> query(Project project, ObjectId commitId) {
- return query(project, commitId, null);
+ public Collection<Build> query(Project project, ObjectId commitId, String triggerChain) {
+ return query(project, commitId, null, triggerChain);
}
@Sessional
@Override
- public Collection<Build> query(Project project, ObjectId commitId, String jobName) {
- return query(project, commitId, jobName, null, null, new HashMap<>());
+ public Collection<Build> query(Project project, ObjectId commitId, String jobName, String triggerChain) {
+ return query(project, commitId, jobName, null, null, new HashMap<>(), triggerChain);
}
@Sessional
@Override
public Collection<Build> query(Project project, ObjectId commitId, String jobName,
- String refName, Optional<PullRequest> request, Map<String, List<String>> params) {
+ String refName, Optional<PullRequest> request, Map<String, List<String>> params,
+ String triggerChain) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Build> query = builder.createQuery(Build.class);
Root<Build> root = query.from(Build.class);
@@ -284,6 +285,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
List<Predicate> predicates = new ArrayList<>();
predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));
predicates.add(builder.equal(root.get(Build.PROP_COMMIT), commitId.name()));
+ if (triggerChain != null)
+ predicates.add(builder.equal(root.get(Build.PROP_TRIGGER_CHAIN), triggerChain));
if (jobName != null)
predicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));
if (refName != null)
@@ -572,7 +575,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
}
if (orders.isEmpty())
- orders.add(builder.desc(root.get(Build.PROP_SUBMIT_DATE)));
+ orders.add(builder.desc(root.get(Build.PROP_NUMBER)));
criteriaQuery.orderBy(orders);
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 2647b4474b..7bad7dae44 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3474,4 +3474,15 @@ public class DataMigrator {
}
}
}
+
+ private void migrate74(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Builds.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements())
+ element.addElement("triggerChain").setText(UUID.randomUUID().toString());
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 84e8a97fad..772042f678 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -5,6 +5,7 @@ import static io.onedev.server.model.Build.PROP_FINISH_DATE;
import static io.onedev.server.model.Build.PROP_FINISH_DAY;
import static io.onedev.server.model.Build.PROP_JOB;
import static io.onedev.server.model.Build.PROP_NUMBER;
+import static io.onedev.server.model.Build.PROP_TRIGGER_CHAIN;
import static io.onedev.server.model.Build.PROP_PENDING_DATE;
import static io.onedev.server.model.Build.PROP_REF_NAME;
import static io.onedev.server.model.Build.PROP_RUNNING_DATE;
@@ -100,7 +101,7 @@ import io.onedev.server.web.util.WicketUtils;
@Table(
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),
@Index(columnList="o_request_id"),
- @Index(columnList=PROP_COMMIT),
+ @Index(columnList=PROP_COMMIT), @Index(columnList=PROP_TRIGGER_CHAIN),
@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB),
@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),
@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),
@@ -137,6 +138,8 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_STATUS = "status";
+ public static final String PROP_TRIGGER_CHAIN = "triggerChain";
+
public static final String NAME_SUBMITTER = "Submitter";
public static final String PROP_SUBMITTER = "submitter";
@@ -302,6 +305,9 @@ public class Build extends AbstractEntity implements Referenceable {
private Date retryDate;
+ @Column(nullable=false)
+ private String triggerChain;
+
@JsonIgnore
private Integer finishDay;
@@ -448,6 +454,14 @@ public class Build extends AbstractEntity implements Referenceable {
this.status = status;
}
+ public String getTriggerChain() {
+ return triggerChain;
+ }
+
+ public void setTriggerChain(String triggerChain) {
+ this.triggerChain = triggerChain;
+ }
+
public Date getStatusDate() {
switch (status) {
case FAILED:
diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index 2a311f0117..6a2226e14b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -308,7 +308,7 @@ public class BranchProtection implements Serializable {
Map<String, String> gitEnvs) {
Collection<String> requiredJobNames = getRequiredJobs(project, oldObjectId, newObjectId, gitEnvs);
- Collection<Build> builds = OneDev.getInstance(BuildManager.class).query(project, newObjectId);
+ Collection<Build> builds = OneDev.getInstance(BuildManager.class).query(project, newObjectId, null);
for (Build build: builds) {
if (requiredJobNames.contains(build.getJobName()) && build.getStatus() != Status.SUCCESSFUL)
return true;
diff --git a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
index 4115d67433..91d5f41af6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -143,7 +144,8 @@ public class JobRunResource {
};
}
- return jobManager.submit(project, commitId, jobRun.getJobName(), jobRun.getParams(), reason).getId();
+ return jobManager.submit(project, commitId, jobRun.getJobName(),
+ jobRun.getParams(), UUID.randomUUID().toString(), reason).getId();
}
@Api(order=200)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
index 4422a16759..ed31ceb020 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.UUID;
import javax.annotation.Nullable;
@@ -108,6 +109,11 @@ public abstract class CommitStatusPanel extends Panel {
protected PullRequest getPullRequest() {
return CommitStatusPanel.this.getPullRequest();
}
+
+ @Override
+ protected String getTriggerChain() {
+ return UUID.randomUUID().toString();
+ }
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 54d8465068..769dda788d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -58,6 +58,8 @@ public abstract class RunJobLink extends AjaxLink<Void> {
protected abstract Project getProject();
+ protected abstract String getTriggerChain();
+
@Nullable
protected abstract PullRequest getPullRequest();
@@ -103,6 +105,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
Serializable populatedParamBean) {
Map<String, List<String>> paramMap = ParamUtils.getParamMap(
job, populatedParamBean, job.getParamSpecMap().keySet());
+ String triggerChain = getTriggerChain();
List<Build> builds = new ArrayList<>();
for (String refName: selectedRefNames) {
SubmitReason reason = new SubmitReason() {
@@ -123,11 +126,8 @@ public abstract class RunJobLink extends AjaxLink<Void> {
}
};
- Build build = getJobManager().submit(getProject(), commitId, job.getName(),
- paramMap, reason);
- if (build.isFinished())
- getJobManager().resubmit(build, paramMap, "Resubmitted manually ");
- builds.add(build);
+ builds.add(getJobManager().submit(getProject(), commitId, job.getName(),
+ paramMap, triggerChain, reason));
}
if (builds.size() == 1)
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));
@@ -171,9 +171,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
};
Build build = getJobManager().submit(getProject(), commitId, job.getName(),
- new HashMap<>(), reason);
- if (build.isFinished())
- getJobManager().resubmit(build, new HashMap<>(), "Resubmitted manually");
+ new HashMap<>(), getTriggerChain(), reason);
setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index 2c6c49ad46..9d42107b7f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -71,6 +71,8 @@ public abstract class JobListPanel extends Panel {
protected abstract Project getProject();
+ protected abstract String getTriggerChain();
+
@Nullable
protected abstract PullRequest getPullRequest();
@@ -124,6 +126,11 @@ public abstract class JobListPanel extends Panel {
protected PullRequest getPullRequest() {
return JobListPanel.this.getPullRequest();
}
+
+ @Override
+ protected String getTriggerChain() {
+ return JobListPanel.this.getTriggerChain();
+ }
});
@@ -143,8 +150,9 @@ public abstract class JobListPanel extends Panel {
@Override
protected List<Build> load() {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId,
- job.getName(), refName, Optional.ofNullable(getPullRequest()), new HashMap<>()));
+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(),
+ commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),
+ new HashMap<>(), null));
builds.sort(Comparator.comparing(Build::getNumber));
return builds;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 2b189f6c89..0c38f2a3d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -301,7 +301,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
Collection<Build> builds = buildsCache.get(commitId);
if (builds == null) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- builds = buildManager.query(getProject(), commitId, null, null, null, new HashMap<>());
+ builds = buildManager.query(getProject(), commitId, null, null, null, new HashMap<>(), null);
buildsCache.put(commitId, builds);
}
return builds;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index 7e6f9eeccc..776a3610a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.annotation.Nullable;
import javax.validation.ConstraintViolation;
@@ -229,6 +230,11 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
protected PullRequest getPullRequest() {
return context.getPullRequest();
}
+
+ @Override
+ protected String getTriggerChain() {
+ return UUID.randomUUID().toString();
+ }
});
navsView.add(nav);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 4c81df21f3..ce5351acf6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -151,7 +151,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
List<String> lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>())) {
+ for (Build build: buildManager.query(project, commitId, null, null, null, new HashMap<>(), null)) {
for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {
for (CodeProblem problem: contribution.getCodeProblems(build, path, context.getProblemReport()))
problems.add(problem.normalizeRange(lines));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 09990bd784..48cb59e41b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -16,6 +16,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -57,6 +58,7 @@ import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
@@ -230,6 +232,12 @@ public abstract class BuildDetailPage extends ProjectPage
actionsContainer.add(new AjaxLink<Void>("rebuild") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to rebuild?"));
+ }
+
private void resubmit(Serializable paramBean) {
Map<String, List<String>> paramMap = ParamUtils.getParamMap(getBuild().getJob(), paramBean,
getBuild().getJob().getParamSpecMap().keySet());
@@ -315,6 +323,11 @@ public abstract class BuildDetailPage extends ProjectPage
protected PullRequest getPullRequest() {
return getBuild().getRequest();
}
+
+ @Override
+ protected String getTriggerChain() {
+ return getBuild().getTriggerChain();
+ }
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index de58f6db57..08514172f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -9,6 +9,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -423,6 +424,11 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
protected PullRequest getPullRequest() {
return null;
}
+
+ @Override
+ protected String getTriggerChain() {
+ return UUID.randomUUID().toString();
+ }
});
}