The Unified and Autonomous Development Platform
feat: Able to run scheduled job on any branches (#1825)
Robin Shenee9c6483e158
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 8f2f7b1fb0..aea05344a2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -162,17 +162,18 @@ public class BuildSpec implements Serializable, Validatable {if (!commitChain.contains(importCommit.name())) {Collection<String> newCommitChain = new HashSet<>(commitChain);newCommitChain.add(importCommit.name());+ BuildSpec importedBuildSpec = aImport.getBuildSpec();JobAuthorizationContext.push(new JobAuthorizationContext(aImport.getProject(), importCommit, SecurityUtils.getUser(), null));try {- BuildSpec importedBuildSpec = aImport.getBuildSpec();importedBuildSpecs.addAll(importedBuildSpec.getImportedBuildSpecs(newCommitChain));- importedBuildSpecs.add(importedBuildSpec);} finally {JobAuthorizationContext.pop();}+ importedBuildSpecs.add(importedBuildSpec);}} catch (Exception e) {+ e.printStackTrace();// Ignore here as we rely on this method to show viewer/editor// Errors relating to this will be shown when validated}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.javaindex a4dccce526..43c3ecc2a4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java@@ -7,11 +7,16 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;import javax.annotation.Nullable;+import java.io.Serializable;import java.util.List;-public class TriggerMatch {+public class TriggerMatch implements Serializable {++ private static final long serialVersionUID = 1L;private final String refName;@@ -67,4 +72,36 @@ public class TriggerMatch {public String getReason() {return reason;}++ @Override+ public boolean equals(Object other) {+ if (other == null)+ return false;+ if (other == this)+ return true;+ if (other.getClass() != getClass())+ return false;+ TriggerMatch otherTriggerMatch = (TriggerMatch) other;+ return new EqualsBuilder()+ .append(refName, otherTriggerMatch.refName)+ .append(requestId, otherTriggerMatch.requestId)+ .append(issueId, otherTriggerMatch.issueId)+ .append(paramMatrix, otherTriggerMatch.paramMatrix)+ .append(excludeParamMaps, otherTriggerMatch.excludeParamMaps)+ .append(reason, otherTriggerMatch.reason)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(refName)+ .append(requestId)+ .append(issueId)+ .append(paramMatrix)+ .append(excludeParamMaps)+ .append(reason)+ .toHashCode();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.javaindex 7cd2121525..96f4292f48 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java@@ -1,14 +1,22 @@package io.onedev.server.buildspec.job.trigger;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.annotation.CronExpression;import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Patterns;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.TriggerMatch;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.event.project.ScheduledTimeReaches;import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.util.SuggestionUtils;import javax.validation.constraints.NotEmpty;+import java.util.List;@Editable(order=600, name="Cron schedule")public class ScheduleTrigger extends JobTrigger {@@ -17,8 +25,10 @@ public class ScheduleTrigger extends JobTrigger {private String cronExpression;+ private String branches;+@Editable(order=100, description="Specify a <a target='_blank' href='http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html#format'>cron schedule</a> to "- + "fire the job automatically. <b>Note:</b> this is only applicable to default branch")+ + "fire the job automatically. <b class='text-info'>Note:</b> To save resource, seconds in cron expression will be ignored, and the minimum schedule interval is one minute")@CronExpression@NotEmptypublic String getCronExpression() {@@ -29,14 +39,37 @@ public class ScheduleTrigger extends JobTrigger {this.cronExpression = cronExpression;}+ @Editable(name="Applicable Branches", order=200, placeholder="Default branch", description=""+ + "Optionally specify space-separated branches applicable for this trigger. "+ + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "+ + "Prefix with '-' to exclude. Leave empty for default branch")+ @Patterns(suggester="suggestBranches", path=true)+ public String getBranches() {+ return branches;+ }++ public void setBranches(String branches) {+ this.branches = branches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }+@Overrideprotected TriggerMatch triggerMatches(ProjectEvent event, Job job) {if (event instanceof ScheduledTimeReaches) {- return new TriggerMatch(GitUtils.branch2ref(event.getProject().getDefaultBranch()),- null, null, getParamMatrix(), getExcludeParamMaps(), "Scheduled");- } else {- return null;+ String branch = ((ScheduledTimeReaches) event).getBranch();+ Matcher matcher = new PathMatcher();++ if (branches == null && branch.equals(event.getProject().getDefaultBranch())+ || PatternSet.parse(branches).matches(matcher, branch)) {+ return new TriggerMatch(GitUtils.branch2ref(branch),+ null, null, getParamMatrix(), getExcludeParamMaps(), "Scheduled");+ }}+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.javaindex 7847dd664f..1f99326808 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamInstance.java@@ -58,9 +58,10 @@ public class ParamInstance implements Serializable {return true;ParamInstance otherParamValue = (ParamInstance) other;return new EqualsBuilder()- .append(name, otherParamValue.name)- .append(valueProvider, otherParamValue.valueProvider)- .isEquals();+ .append(name, otherParamValue.name)+ .append(secret, otherParamValue.secret)+ .append(valueProvider, otherParamValue.valueProvider)+ .isEquals();}@Overridediff --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.javaindex 1efa10a32f..342d718169 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@@ -562,7 +562,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}if (orders.isEmpty())- orders.add(builder.desc(root.get(Build.PROP_NUMBER)));+ orders.add(builder.desc(root.get(Build.PROP_ID)));criteriaQuery.orderBy(orders);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex d79228b865..d109c7aae7 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -284,24 +284,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>for (IssueQueryUpdater updater : link.getQueryUpdaters())updater.onMoveProject(oldPath, project.getPath());}-- transactionManager.runAfterCommit(() -> scheduleJobs(project));}}- private void scheduleJobs(Project project) {- Long projectId = project.getId();- String projectPath = project.getPath();- submitToActiveServer(projectId, () -> {- try {- sessionManager.run(() -> jobManager.schedule(load(projectId), true));- } catch (Exception e) {- logger.error("Error scheduling project tree '" + projectPath + "'", e);- }- return null;- });- }-@Transactional@Overridepublic void create(Project project) {diff --git a/server-core/src/main/java/io/onedev/server/event/project/ScheduledTimeReaches.java b/server-core/src/main/java/io/onedev/server/event/project/ScheduledTimeReaches.javaindex 02e450276d..5fcb8efd92 100644--- a/server-core/src/main/java/io/onedev/server/event/project/ScheduledTimeReaches.java+++ b/server-core/src/main/java/io/onedev/server/event/project/ScheduledTimeReaches.java@@ -7,9 +7,16 @@ import io.onedev.server.model.Project;public class ScheduledTimeReaches extends ProjectEvent {private static final long serialVersionUID = 1L;++ private final String branch;- public ScheduledTimeReaches(Project project) {+ public ScheduledTimeReaches(Project project, String branch) {super(null, new Date(), project);+ this.branch = branch;+ }++ public String getBranch() {+ return branch;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 4f79bf4fe6..fa4fab1603 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -22,7 +22,6 @@ import io.onedev.server.buildspec.job.action.condition.ActionCondition;import io.onedev.server.buildspec.job.projectdependency.ProjectDependency;import io.onedev.server.buildspec.job.retrycondition.RetryCondition;import io.onedev.server.buildspec.job.retrycondition.RetryContext;-import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.buildspec.job.trigger.ScheduleTrigger;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;@@ -34,7 +33,10 @@ import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.*;import io.onedev.server.event.Listen;import io.onedev.server.event.ListenerRegistry;-import io.onedev.server.event.project.*;+import io.onedev.server.event.project.ProjectDeleted;+import io.onedev.server.event.project.ProjectEvent;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.event.project.ScheduledTimeReaches;import io.onedev.server.event.project.build.*;import io.onedev.server.event.project.pullrequest.PullRequestEvent;import io.onedev.server.event.system.SystemStarted;@@ -75,8 +77,11 @@ import nl.altindag.ssl.SSLFactory;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;+import org.joda.time.DateTime;+import org.quartz.CronExpression;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;+import org.quartz.SimpleScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -105,10 +110,10 @@ import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static org.eclipse.jgit.lib.Constants.R_HEADS;@Singleton-public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource,- Serializable, SchedulableTask {+public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource, Serializable {private static final int CHECK_INTERVAL = 1000; // check internal in milli-seconds@@ -121,9 +126,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final Map<String, List<Action>> jobActions = new ConcurrentHashMap<>();private final Map<String, JobRunnable> jobRunnables = new ConcurrentHashMap<>();-- private final Map<Long, Collection<String>> projectTasks = new ConcurrentHashMap<>();-+private final Map<String, Shell> jobShells = new ConcurrentHashMap<>();private final Dao dao;@@ -170,9 +173,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate volatile IMap<String, String> jobServers;- private volatile Map<String, Collection<String>> allocatedCaches;++ private volatile Map<String, List<JobSchedule>> branchSchedules;private volatile String maintenanceTaskId;++ private volatile String branchSchedulesTaskId;@Injectpublic DefaultJobManager(BuildManager buildManager, UserManager userManager, ListenerRegistry listenerRegistry,@@ -660,14 +666,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizlistenerRegistry.post(new BuildFinished(build));}- @Listen- public void on(ProjectCreated event) {- schedule(event.getProject(), false);- }-@Listenpublic void on(ProjectDeleted event) {- unschedule(event.getProjectId());+ var keysToRemove = new HashSet<String>();+ for (var key: branchSchedules.keySet()) {+ if (key.startsWith(event.getProjectId() + ":"))+ keysToRemove.add(key);+ }+ for (var key: keysToRemove)+ branchSchedules.remove(key);}@Sessional@@ -967,122 +974,111 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Listenpublic void on(SystemStarting event) {var hazelcastInstance = clusterManager.getHazelcastInstance();- allocatedCaches = hazelcastInstance.getMap("allocatedCaches");jobServers = hazelcastInstance.getMap("jobServers");+ branchSchedules = hazelcastInstance.getReplicatedMap("jobSchedules");}- @Sessional- @Listen- public void on(SystemStarted event) {- var localServer = clusterManager.getLocalServerAddress();- for (var projectId: projectManager.getIds()) {- if (localServer.equals(projectManager.getActiveServer(projectId, false))) {- schedule(projectManager.load(projectId), false);- }- }- thread = new Thread(this);- thread.start();- maintenanceTaskId = taskScheduler.schedule(this);- }-- @Sessional- @Listen- public void on(ActiveServerChanged event) {- for (var projectId: event.getProjectIds())- schedule(projectManager.load(projectId), false);- }-- @Sessional- @Listen- public void on(DefaultBranchChanged event) {- schedule(event.getProject(), false);- }-- @Sessional- @Listen- public void on(RefUpdated event) {- String branch = GitUtils.ref2branch(event.getRefName());- Project project = event.getProject();- if (branch != null && branch.equals(project.getDefaultBranch()) && !event.getNewCommitId().equals(ObjectId.zeroId()))- schedule(project, false);- }-- @Sessional- @Override- public void schedule(Project project, boolean recursive) {- Collection<String> tasksOfProject = new HashSet<>();+ private void cacheBranchSchedules(Project project, String branch, ObjectId commitId) {+ JobAuthorizationContext.push(new JobAuthorizationContext(project, commitId, SecurityUtils.getUser(), null));try {- String defaultBranch = project.getDefaultBranch();- if (defaultBranch != null) {- ObjectId commitId = project.getObjectId(defaultBranch, false);- if (commitId != null) {- JobAuthorizationContext.push(new JobAuthorizationContext(project, commitId, SecurityUtils.getUser(), null));- try {- BuildSpec buildSpec = project.getBuildSpec(commitId);- if (buildSpec != null) {- validateBuildSpec(project, commitId, buildSpec);- ScheduledTimeReaches event = new ScheduledTimeReaches(project);- for (Job job : buildSpec.getJobMap().values()) {- for (JobTrigger trigger : job.getTriggers()) {- if (trigger instanceof ScheduleTrigger) {- ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;- TriggerMatch match = trigger.matches(event, job);- if (match != null) {- String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, match.getRefName(), match.getReason()));- tasksOfProject.add(taskId);- }- }- }+ var schedules = new ArrayList<JobSchedule>();+ if (!commitId.equals(ObjectId.zeroId())) {+ var buildSpec = project.getBuildSpec(commitId);+ if (buildSpec != null) {+ validateBuildSpec(project, commitId, buildSpec);+ var triggerEvent = new ScheduledTimeReaches(project, branch);+ for (var job : buildSpec.getJobMap().values()) {+ for (var trigger : job.getTriggers()) {+ var match = trigger.matches(triggerEvent, job);+ if (match != null) {+ var cronExpression = new CronExpression(((ScheduleTrigger)trigger).getCronExpression());+ schedules.add(new JobSchedule(commitId, job.getName(), cronExpression, match));}}- } catch (BuildSpecParseException e) {- logger.warn("Malformed build spec (project: {}, branch: {})",- project.getPath(), defaultBranch);- } finally {- JobAuthorizationContext.pop();}}}+ var key = project.getId() + ":" + branch;+ if (schedules.isEmpty())+ branchSchedules.remove(key);+ else+ branchSchedules.put(key, schedules);+ } catch (BuildSpecParseException e) {+ logger.warn("Malformed build spec (project: {}, branch: {})", project.getPath(), branch);} catch (Exception e) {- logger.error("Error scheduling project '" + project.getPath() + "'", e);+ logger.error(String.format("Error caching branch schedules (project: %s, branch: %s)", project.getPath(), branch), e);} finally {- tasksOfProject = projectTasks.put(project.getId(), tasksOfProject);- if (tasksOfProject != null)- tasksOfProject.forEach(taskScheduler::unschedule);- }- if (recursive) {- for (var child : project.getChildren())- schedule(child, true);+ JobAuthorizationContext.pop();}}-+@Sessional- @Override- public void unschedule(Long projectId) {- var tasksOfProject = projectTasks.remove(projectId);- if (tasksOfProject != null)- tasksOfProject.forEach(taskScheduler::unschedule);- }+ @Listen+ public void on(SystemStarted event) {+ for (var projectId: projectManager.getActiveIds()) {+ var project = projectManager.load(projectId);+ var repository = projectManager.getRepository(projectId);+ try {+ for (var ref: repository.getRefDatabase().getRefsByPrefix(R_HEADS)) {+ var branch = GitUtils.ref2branch(ref.getName());+ cacheBranchSchedules(project, branch, ref.getObjectId());+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ maintenanceTaskId = taskScheduler.schedule(new SchedulableTask() {++ @Override+ public void execute() {+ if (clusterManager.isLeaderServer()) {+ var activeJobTokens = getActiveJobTokens();+ jobServers.removeAll(it -> !activeJobTokens.contains(it.getKey()));+ }+ }- private SchedulableTask newSchedulableTask(Project project, ObjectId commitId, Job job,- ScheduleTrigger trigger, String refName,- String reason) {- Long projectId = project.getId();- var localServer = clusterManager.getLocalServerAddress();- return new SchedulableTask() {+ @Override+ public ScheduleBuilder<?> getScheduleBuilder() {+ return CronScheduleBuilder.dailyAtHourAndMinute(4, 0);+ }+ });+ branchSchedulesTaskId = taskScheduler.schedule(new SchedulableTask() {@Overridepublic void execute() {- if (thread != null && localServer.equals(projectManager.getActiveServer(projectId, false))) {+ if (thread != null) {sessionManager.run(() -> {SecurityUtils.bindAsSystem();- Project aProject = projectManager.load(projectId);- String pipeline = UUID.randomUUID().toString();- var paramMaps = resolveParams(null, null,- trigger.getParamMatrix(), trigger.getExcludeParamMaps());- for (var paramMap: paramMaps) {- submit(aProject, commitId, job.getName(), paramMap, pipeline,- refName, SecurityUtils.getUser(), null, null, reason);+ var currentTime = new Date();+ var nextCheckTime = new DateTime(currentTime.getTime()).plusMinutes(1).toDate();+ var activeProjectIds = projectManager.getActiveIds();+ for (var entry: branchSchedules.entrySet()) {+ var projectId = Long.valueOf(StringUtils.substringBefore(entry.getKey(), ":"));+ if (activeProjectIds.contains(projectId)) {+ Project project = projectManager.load(projectId);+ for (var schedule: entry.getValue()) {+ var match = schedule.getMatch();+ try {+ var commitId = schedule.getCommitId();+ var nextFireTime = schedule.getCronExpression().getNextValidTimeAfter(currentTime);+ if (nextFireTime != null && !nextFireTime.after(nextCheckTime)) {+ String pipeline = UUID.randomUUID().toString();+ var paramMaps = resolveParams(null, null,+ match.getParamMatrix(), match.getExcludeParamMaps());+ for (var paramMap : paramMaps) {+ submit(project, commitId, schedule.getJobName(), paramMap, pipeline,+ match.getRefName(), SecurityUtils.getUser(), null,+ null, match.getReason());+ }+ }+ } catch (Exception e) {+ String errorMessage = String.format("Error triggering scheduled job (project: %s, branch: %s)",+ project.getPath(), GitUtils.ref2branch(match.getRefName()));+ logger.error(errorMessage, e);+ }+ }+ }}});}@@ -1090,12 +1086,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.cronSchedule(trigger.getCronExpression());+ return SimpleScheduleBuilder.repeatMinutelyForever();}-- };++ });++ thread = new Thread(this);+ thread.start();}+ @Sessional+ @Listen+ public void on(RefUpdated event) {+ String branch = GitUtils.ref2branch(event.getRefName());+ Project project = event.getProject();+ cacheBranchSchedules(project, branch, event.getNewCommitId());+ }+@Listenpublic void on(SystemStopping event) {Thread copy = thread;@@ -1106,9 +1113,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} catch (InterruptedException ignored) {}}- projectTasks.values().forEach(it -> it.forEach(taskScheduler::unschedule));- projectTasks.clear();-+ if (branchSchedulesTaskId != null)+ taskScheduler.unschedule(branchSchedulesTaskId);if (maintenanceTaskId != null)taskScheduler.unschedule(maintenanceTaskId);}@@ -1481,18 +1487,5 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}return activeJobTokens;}-- @Override- public void execute() {- if (clusterManager.isLeaderServer()) {- var activeJobTokens = getActiveJobTokens();- jobServers.removeAll(it -> !activeJobTokens.contains(it.getKey()));- }- }-- @Override- public ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(4, 0);- }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.javaindex ee0ecaa4e9..45371e1acd 100644--- a/server-core/src/main/java/io/onedev/server/job/JobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/JobManager.java@@ -16,10 +16,6 @@ import java.util.Map;public interface JobManager {- void schedule(Project project, boolean recursive);-- void unschedule(Long projectId);-Build submit(Project project, ObjectId commitId, String jobName,Map<String, List<String>> paramMap, String pipeline,String refName, User submitter, @Nullable PullRequest request,diff --git a/server-core/src/main/java/io/onedev/server/job/JobSchedule.java b/server-core/src/main/java/io/onedev/server/job/JobSchedule.javanew file mode 100644index 0000000000..b14f76c912--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/job/JobSchedule.java@@ -0,0 +1,74 @@+package io.onedev.server.job;++import io.onedev.server.buildspec.job.TriggerMatch;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.eclipse.jgit.lib.ObjectId;+import org.quartz.CronExpression;++import java.io.Serializable;++public class JobSchedule implements Serializable {++ private static final long serialVersionUID = 1L;++ private final ObjectId commitId;++ private final String jobName;++ private final CronExpression cronExpression;++ private final TriggerMatch match;++ public JobSchedule(ObjectId commitId, String jobName, CronExpression cronExpression,+ TriggerMatch match) {+ this.commitId = commitId;+ this.jobName = jobName;+ this.cronExpression = cronExpression;+ this.match = match;+ }++ public ObjectId getCommitId() {+ return commitId;+ }++ public String getJobName() {+ return jobName;+ }++ public CronExpression getCronExpression() {+ return cronExpression;+ }++ public TriggerMatch getMatch() {+ return match;+ }++ @Override+ public boolean equals(Object other) {+ if (other == null)+ return false;+ if (other == this)+ return true;+ if (other.getClass() != getClass())+ return false;+ JobSchedule otherJobSchedule = (JobSchedule) other;+ return new EqualsBuilder()+ .append(commitId, otherJobSchedule.commitId)+ .append(jobName, otherJobSchedule.jobName)+ .append(cronExpression, otherJobSchedule.cronExpression)+ .append(match, otherJobSchedule.match)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(commitId)+ .append(jobName)+ .append(cronExpression)+ .append(match)+ .toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.javaindex f423ef6df9..bac63b2477 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java@@ -77,7 +77,7 @@ public class MiniBuildListPanel extends GenericPanel<List<Build>> {});add(fragment);} else {- add(new Label("content", "No builds").add(AttributeAppender.append("class", "no-builds font-italic mx-5 my-4")));+ add(new Label("content", "No builds").add(AttributeAppender.append("class", "no-builds font-italic mx-5 my-4 text-nowrap")));}}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.javaindex b9cdd5afec..dc395289bb 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@@ -9,6 +9,9 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.git.service.RefFacade;+import io.onedev.server.job.JobAuthorizationContext;+import io.onedev.server.job.JobAuthorizationContextAware;+import io.onedev.server.util.ComponentContext;import io.onedev.server.xodus.CommitInfoManager;import io.onedev.server.job.JobManager;import io.onedev.server.model.Build;@@ -31,7 +34,7 @@ import java.util.*;import java.util.stream.Collectors;@SuppressWarnings("serial")-public abstract class RunJobLink extends AjaxLink<Void> {+public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizationContextAware {private final String refName;@@ -56,98 +59,103 @@ public abstract class RunJobLink extends AjaxLink<Void> {@Overridepublic void onClick(AjaxRequestTarget target) {- BuildSpec buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(commitId));-- Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)- .getDescendants(getProject().getId(), Sets.newHashSet(commitId));- descendants.add(commitId);-- List<RefFacade> branchRefs = getProject().getBranchRefs();-- List<String> refNames;-- if (refName != null) {- refNames = Lists.newArrayList(refName);- } else if (getPullRequest() != null) {- refNames = Lists.newArrayList(getPullRequest().getMergeRef());- } else {- refNames = branchRefs.stream()- .filter(it->descendants.contains(it.getPeeledObj()))- .map(RefFacade::getName)- .collect(Collectors.toList());- for (var tagRef: getProject().getTagRefs()) {- if (tagRef.getPeeledObj().equals(commitId))- refNames.add(tagRef.getName());- }- }+ ComponentContext.push(new ComponentContext(this));+ try {+ BuildSpec buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(commitId));++ Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)+ .getDescendants(getProject().getId(), Sets.newHashSet(commitId));+ descendants.add(commitId);++ List<RefFacade> branchRefs = getProject().getBranchRefs();++ List<String> refNames;- if (!refNames.isEmpty()) {- Job job = Preconditions.checkNotNull(buildSpec.getJobMap().get(jobName));- if (refNames.size() > 1 || !job.getParamSpecs().isEmpty()) {- Serializable paramBean;- try {- paramBean = ParamUtils.defineBeanClass(job.getParamSpecs())- .getDeclaredConstructor().newInstance();- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException- | InvocationTargetException | NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);+ if (refName != null) {+ refNames = Lists.newArrayList(refName);+ } else if (getPullRequest() != null) {+ refNames = Lists.newArrayList(getPullRequest().getMergeRef());+ } else {+ refNames = branchRefs.stream()+ .filter(it -> descendants.contains(it.getPeeledObj()))+ .map(RefFacade::getName)+ .collect(Collectors.toList());+ for (var tagRef : getProject().getTagRefs()) {+ if (tagRef.getPeeledObj().equals(commitId))+ refNames.add(tagRef.getName());}-- new BuildOptionModalPanel(target, refNames, paramBean) {+ }- @Override- protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,- Serializable populatedParamBean) {- Map<String, List<String>> paramMap = ParamUtils.getParamMap(- job, populatedParamBean, job.getParamSpecMap().keySet());- String pipeline = getPipeline();- List<Build> builds = new ArrayList<>();- for (String refName: selectedRefNames) {- builds.add(getJobManager().submit(getProject(), commitId, job.getName(),- paramMap, pipeline, refName, SecurityUtils.getUser(),- getPullRequest(), null, "Submitted manually"));- }- if (builds.size() == 1)- setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));- else- close();- if (builds.stream().allMatch(it->it.isFinished()))- Session.get().warn("Build already fired in current pipeline");+ if (!refNames.isEmpty()) {+ Job job = Preconditions.checkNotNull(buildSpec.getJobMap().get(jobName));+ if (refNames.size() > 1 || !job.getParamSpecs().isEmpty()) {+ Serializable paramBean;+ try {+ paramBean = ParamUtils.defineBeanClass(job.getParamSpecs())+ .getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {+ throw new RuntimeException(e);}- @Override- protected Project getProject() {- return RunJobLink.this.getProject();- }+ new BuildOptionModalPanel(target, refNames, paramBean) {- @Override- public List<String> getInputNames() {- return new ArrayList<>(job.getParamSpecMap().keySet());- }+ @Override+ protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,+ Serializable populatedParamBean) {+ Map<String, List<String>> paramMap = ParamUtils.getParamMap(+ job, populatedParamBean, job.getParamSpecMap().keySet());+ String pipeline = getPipeline();+ List<Build> builds = new ArrayList<>();+ for (String refName : selectedRefNames) {+ builds.add(getJobManager().submit(getProject(), commitId, job.getName(),+ paramMap, pipeline, refName, SecurityUtils.getUser(),+ getPullRequest(), null, "Submitted manually"));+ }+ if (builds.size() == 1)+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));+ else+ close();+ if (builds.stream().allMatch(it -> it.isFinished()))+ Session.get().warn("Build already fired in current pipeline");+ }++ @Override+ protected Project getProject() {+ return RunJobLink.this.getProject();+ }++ @Override+ public List<String> getInputNames() {+ return new ArrayList<>(job.getParamSpecMap().keySet());+ }++ @Override+ public ParamSpec getInputSpec(String paramName) {+ return Preconditions.checkNotNull(job.getParamSpecMap().get(paramName));+ }++ };+ } else {+ Build build = getJobManager().submit(getProject(), commitId, job.getName(),+ new HashMap<>(), getPipeline(), refNames.iterator().next(),+ SecurityUtils.getUser(), getPullRequest(), null, "Submitted manually");+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));+ if (build.isFinished())+ Session.get().warn("Build already fired in current pipeline");+ }+ } else {+ new MessageModal(target) {@Override- public ParamSpec getInputSpec(String paramName) {- return Preconditions.checkNotNull(job.getParamSpecMap().get(paramName));+ protected Component newMessageContent(String componentId) {+ return new Label(componentId, "No refs to build on behalf of");}};- } else {- Build build = getJobManager().submit(getProject(), commitId, job.getName(),- new HashMap<>(), getPipeline(), refNames.iterator().next(),- SecurityUtils.getUser(), getPullRequest(), null, "Submitted manually");- setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));- if (build.isFinished())- Session.get().warn("Build already fired in current pipeline");}- } else {- new MessageModal(target) {-- @Override- protected Component newMessageContent(String componentId) {- return new Label(componentId, "No refs to build on behalf of");- }-- };+ } finally {+ ComponentContext.pop();}}@@ -160,5 +168,10 @@ public abstract class RunJobLink extends AjaxLink<Void> {super.onConfigure();setVisible(SecurityUtils.canRunJob(getProject(), jobName));}++ @Override+ public JobAuthorizationContext getJobAuthorizationContext() {+ return new JobAuthorizationContext(getProject(), commitId, SecurityUtils.getUser(), getPullRequest());+ }}