Skip to content

The Unified and Autonomous Development Platform

feat: Do not re-run upstream job when run downstream jobs (#1872)

Robin Shen18dfe9987a25
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 798b09e812..cc1392ad86 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -374,13 +374,11 @@ public class Job implements NamedElement, Serializable, Validatable {
}
public static String getBuildQuery(ObjectId commitId, String jobName,
- @Nullable Build pipelineOf, @Nullable String refName, @Nullable PullRequest request) {
+ @Nullable String refName, @Nullable PullRequest request) {
String query = ""
+ Criteria.quote(NAME_COMMIT) + " " + getRuleName(Is) + " " + Criteria.quote(commitId.name())
+ " " + getRuleName(And) + " "
+ Criteria.quote(NAME_JOB) + " " + getRuleName(Is) + " " + Criteria.quote(jobName);
- if (pipelineOf != null)
- query = query + " " + getRuleName(And) + " " + getRuleName(InPipelineOf) + " " + Criteria.quote("#" + pipelineOf.getNumber());
if (request != null) {
query = query
+ " " + getRuleName(And) + " "
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 c3e68b80ba..4991644d3b 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
@@ -106,9 +106,9 @@ public class RunJobAction extends PostBuildAction {
public void execute(Build build) {
for (var paramMap: resolveParams(build, build.getParamCombination(), getParamMatrix(), getExcludeParamMaps())) {
JobManager jobManager = OneDev.getInstance(JobManager.class);
- jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),
- paramMap, build.getPipeline(), build.getRefName(),
- build.getSubmitter(), build.getRequest(), build.getIssue(),
+ jobManager.submit(build.getProject(), build.getCommitId(),
+ getJobName(), paramMap, build.getRefName(),
+ build.getSubmitter(), build.getRequest(), build.getIssue(),
"Post build action of job '" + build.getJobName() + "'");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index aa30ef26af..827059a986 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6354,5 +6354,17 @@ public class DataMigrator {
dom.writeToFile(file, false);
}
}
- }
+ }
+
+ private void migrate163(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.element("pipeline").detach();
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
\ No newline at end of file
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 7b1aec2ee3..a226381ce4 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
@@ -1,20 +1,21 @@
package io.onedev.server.entitymanager;
-import java.io.File;
-import java.util.*;
-
-import javax.annotation.Nullable;
-
import io.onedev.server.model.*;
-import io.onedev.server.util.artifact.ArtifactInfo;
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectBuildStats;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.StatusInfo;
+import io.onedev.server.util.artifact.ArtifactInfo;
import io.onedev.server.util.criteria.Criteria;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
public interface BuildManager extends EntityManager<Build> {
@@ -40,13 +41,11 @@ public interface BuildManager extends EntityManager<Build> {
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
@Nullable String refName, @Nullable Optional<PullRequest> request,
- @Nullable Optional<Issue> issue, Map<String, List<String>> params,
- @Nullable String pipeline);
+ @Nullable Optional<Issue> issue, Map<String, List<String>> params);
- Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
- @Nullable String pipeline);
+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);
- Collection<Build> query(Project project, ObjectId commitId, @Nullable String pipeline);
+ Collection<Build> query(Project project, ObjectId commitId);
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 342d718169..a3613ad553 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
@@ -243,21 +243,21 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@Sessional
@Override
- public Collection<Build> query(Project project, ObjectId commitId, String pipeline) {
- return query(project, commitId, null, pipeline);
+ public Collection<Build> query(Project project, ObjectId commitId) {
+ return query(project, commitId, null);
}
@Sessional
@Override
- public Collection<Build> query(Project project, ObjectId commitId, String jobName, String pipeline) {
- return query(project, commitId, jobName, null, null, null, new HashMap<>(), pipeline);
+ public Collection<Build> query(Project project, ObjectId commitId, String jobName) {
+ return query(project, commitId, jobName, null, null, null, new HashMap<>());
}
@Sessional
@Override
public Collection<Build> query(Project project, ObjectId commitId, String jobName, String refName,
Optional<PullRequest> request, Optional<Issue> issue,
- Map<String, List<String>> params, String pipeline) {
+ Map<String, List<String>> params) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Build> query = builder.createQuery(Build.class);
Root<Build> root = query.from(Build.class);
@@ -265,8 +265,6 @@ 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_HASH), commitId.name()));
- if (pipeline != null)
- predicates.add(builder.equal(root.get(Build.PROP_PIPELINE), pipeline));
if (jobName != null)
predicates.add(builder.equal(root.get(Build.PROP_JOB_NAME), jobName));
if (refName != null)
@@ -624,17 +622,16 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
@SuppressWarnings("unchecked")
private void fillStatus(Project project, Collection<ObjectId> commitIds,
Map<ObjectId, Map<String, Collection<StatusInfo>>> commitStatuses) {
- Query<?> query = getSession().createQuery("select commitHash, pipeline, jobName, status, refName, request.id from Build "
+ Query<?> query = getSession().createQuery("select commitHash, jobName, status, refName, request.id from Build "
+ "where project=:project and commitHash in :commitHashes");
query.setParameter("project", project);
query.setParameter("commitHashes", commitIds.stream().map(it->it.name()).collect(Collectors.toList()));
for (Object[] row: (List<Object[]>)query.list()) {
ObjectId commitId = ObjectId.fromString((String) row[0]);
- String pipeline = (String) row[1];
- String jobName = (String) row[2];
- Status status = (Status) row[3];
- String refName = (String) row[4];
- Long requestId = (Long) row[5];
+ String jobName = (String) row[1];
+ Status status = (Status) row[2];
+ String refName = (String) row[3];
+ Long requestId = (Long) row[4];
Map<String, Collection<StatusInfo>> commitStatus = commitStatuses.get(commitId);
if (commitStatus == null) {
@@ -646,7 +643,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
jobStatus = new HashSet<>();
commitStatus.put(jobName, jobStatus);
}
- jobStatus.add(new StatusInfo(status, pipeline, requestId, refName));
+ jobStatus.add(new StatusInfo(status, requestId, refName));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 82bfa3da2b..de7f9f7ba2 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
@@ -228,8 +228,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Transactional
@Override
public Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline,
- String refName, User submitter, @Nullable PullRequest request,
+ Map<String, List<String>> paramMap, String refName,
+ User submitter, @Nullable PullRequest request,
@Nullable Issue issue, String reason) {
Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
transactionManager.mustRunAfterTransaction(() -> lock.unlock());
@@ -256,7 +256,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new HttpResponseAwareException(SC_BAD_REQUEST, errorMessage);
}
- return doSubmit(project, commitId, jobName, paramMap, pipeline, refName,
+ return doSubmit(project, commitId, jobName, paramMap, refName,
submitter, request, issue, reason);
} catch (ValidationException e) {
throw new HttpResponseAwareException(SC_BAD_REQUEST, e.getMessage());
@@ -268,8 +268,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private Build doSubmit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline,
- String refName, User submitter, @Nullable PullRequest request,
+ Map<String, List<String>> paramMap, String refName,
+ User submitter, @Nullable PullRequest request,
@Nullable Issue issue, String reason) {
if (request != null) {
request.setBuildCommitHash(commitId.name());
@@ -288,7 +288,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setRefName(refName);
build.setRequest(request);
build.setIssue(issue);
- build.setPipeline(pipeline);
Project.push(project);
try {
@@ -305,7 +304,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Collection<Build> builds = buildManager.query(project, commitId, jobName,
refName, Optional.ofNullable(request), Optional.ofNullable(issue),
- paramMapToQuery, pipeline);
+ paramMapToQuery);
if (builds.isEmpty()) {
for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
@@ -335,7 +334,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
interpolated.getParamMatrix(), interpolated.getExcludeParamMaps());
for (var dependencyParamMap: dependencyParamMaps) {
Build dependencyBuild = doSubmit(project, commitId,
- interpolated.getJobName(), dependencyParamMap, pipeline,
+ interpolated.getJobName(), dependencyParamMap,
refName, submitter, request, issue, reason);
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
@@ -683,11 +682,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (event instanceof CommitAware && ((CommitAware) event).getCommit() != null) {
ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();
if (!commitId.equals(ObjectId.zeroId())) {
- String pipeline;
- if (event instanceof BuildEvent)
- pipeline = ((BuildEvent) event).getBuild().getPipeline();
- else
- pipeline = UUID.randomUUID().toString();
PullRequest request = null;
if (event instanceof PullRequestEvent)
request = ((PullRequestEvent) event).getRequest();
@@ -715,7 +709,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
try {
for (var paramMap: paramMaps) {
submit(project, commitId, job.getName(), paramMap,
- pipeline, match.getRefName(), SecurityUtils.getUser(),
+ match.getRefName(), SecurityUtils.getUser(),
match.getRequest(), match.getIssue(), match.getReason());
}
} catch (Throwable e) {
@@ -1064,13 +1058,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
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,
+ var build = submit(project, commitId, schedule.getJobName(), paramMap,
match.getRefName(), SecurityUtils.getUser(), null,
null, match.getReason());
+ if (build.isFinished())
+ resubmit(build, match.getReason());
}
}
} catch (Exception e) {
diff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.java
index 4b9118262d..b771898ebf 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
@@ -17,8 +17,8 @@ import java.util.Map;
public interface JobManager {
Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline,
- String refName, User submitter, @Nullable PullRequest request,
+ Map<String, List<String>> paramMap, String refName,
+ User submitter, @Nullable PullRequest request,
@Nullable Issue issue, String reason);
void resubmit(Build build, String reason);
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 2d6ed2cffc..4405854e62 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
@@ -61,7 +61,7 @@ import static io.onedev.server.model.Project.BUILDS_DIR;
@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_HASH), @Index(columnList=PROP_PIPELINE),
+ @Index(columnList= PROP_COMMIT_HASH),
@Index(columnList=PROP_NUMBER), @Index(columnList= PROP_JOB_NAME),
@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),
@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),
@@ -102,8 +102,6 @@ public class Build extends ProjectBelonging
public static final String PROP_STATUS = "status";
- public static final String PROP_PIPELINE = "pipeline";
-
public static final String NAME_SUBMITTER = "Submitter";
public static final String PROP_SUBMITTER = "submitter";
@@ -355,9 +353,6 @@ public class Build extends ProjectBelonging
private Date retryDate;
- @Column(nullable=false)
- private String pipeline;
-
@JsonIgnore
private Integer finishDay;
@@ -553,15 +548,7 @@ public class Build extends ProjectBelonging
public void setPaused(boolean paused) {
this.paused = paused;
}
-
- public String getPipeline() {
- return pipeline;
- }
-
- public void setPipeline(String pipeline) {
- this.pipeline = pipeline;
- }
-
+
public Date getStatusDate() {
switch (status) {
case FAILED:
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 73c99d0740..0930f50f37 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -753,8 +753,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
objectIdCache.put(revision, Optional.fromNullable(objectId));
}
- public Map<String, Status> getCommitStatuses(ObjectId commitId,
- @Nullable String pipeline, @Nullable PullRequest request, @Nullable String refName) {
+ public Map<String, Status> getCommitStatuses(ObjectId commitId, @Nullable PullRequest request,
+ @Nullable String refName) {
Map<String, Collection<StatusInfo>> commitStatusInfos = getCommitStatusCache().get(commitId);
if (commitStatusInfos == null) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
@@ -765,8 +765,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
for (Map.Entry<String, Collection<StatusInfo>> entry: commitStatusInfos.entrySet()) {
Collection<Status> statuses = new ArrayList<>();
for (StatusInfo statusInfo: entry.getValue()) {
- if ((pipeline == null || pipeline.equals(statusInfo.getPipeline()))
- && (refName == null || refName.equals(statusInfo.getRefName()))
+ if ((refName == null || refName.equals(statusInfo.getRefName()))
&& Objects.equals(idOf(request), statusInfo.getRequestId())) {
statuses.add(statusInfo.getStatus());
}
@@ -1872,7 +1871,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
Collection<Build> builds = buildsCache.get(commitId);
if (builds == null) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- builds = buildManager.query(this, commitId, null, null, null, null, new HashMap<>(), null);
+ builds = buildManager.query(this, commitId, null, null, null, null, new HashMap<>());
buildsCache.put(commitId, builds);
}
return builds;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java
index e28d6ef300..338b05901d 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java
@@ -105,8 +105,8 @@ public class JobRunResource {
}
Build build = jobManager.submit(project, commitId, jobRun.getJobName(),
- jobRun.getParams(), UUID.randomUUID().toString(), refName,
- SecurityUtils.getUser(), request, null, jobRun.getReason());
+ jobRun.getParams(), refName, SecurityUtils.getUser(), request,
+ null, jobRun.getReason());
return build.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
index 6c0fa80bc0..4a8c9abed5 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java
@@ -129,9 +129,8 @@ public class TriggerJobResource {
}
Build build = jobManager.submit(project, commit.copy(), job,
- jobParams, UUID.randomUUID().toString(), refName,
- SecurityUtils.getUser(), null, null,
- "Triggered via restful api");
+ jobParams, refName, SecurityUtils.getUser(), null,
+ null, "Triggered via restful api");
return build.getId();
} finally {
ThreadContext.unbindSubject();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index db0feba135..e86b38b3f6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=(Successful|Failed|Cancelled|Running|Finished|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria
| criteriaField=Quoted WS+ operator=(IsEmpty|IsNotEmpty) #FieldOperatorCriteria
- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|InPipelineOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| PoundSign? number=Number #NumberCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -78,11 +78,7 @@ DependsOn
DependenciesOf
: 'dependencies' WS+ 'of'
;
-
-InPipelineOf
- : 'in' WS+ 'pipeline' WS+ 'of'
- ;
-
+
RanOn
: 'ran' WS+ 'on'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 2486384293..7d91204505 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -134,8 +134,6 @@ public class BuildQuery extends EntityQuery<Build> {
return new DependsOnCriteria(project, value);
else if (ctx.DependenciesOf() != null)
return new DependenciesOfCriteria(project, value);
- else if (ctx.InPipelineOf() != null)
- return new InPipelineOfCriteria(project, value);
else if (ctx.RanOn() != null)
return new RanOnCriteria(value);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.java
deleted file mode 100644
index 85bc0e7d46..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.onedev.server.search.entity.build;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.util.criteria.Criteria;
-
-public class InPipelineOfCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final Build build;
-
- private final String value;
-
- public InPipelineOfCriteria(@Nullable Project project, String value) {
- build = EntityQuery.getBuild(project, value);
- this.value = value;
- }
-
- @Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
- return builder.equal(from.get(Build.PROP_PIPELINE), build.getPipeline());
- }
-
- @Override
- public boolean matches(Build build) {
- return build.getPipeline().equals(this.build.getPipeline());
- }
-
- @Override
- public String toStringWithoutParens() {
- return BuildQuery.getRuleName(BuildQueryLexer.InPipelineOf) + " " + quote(value);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java b/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
index 58bcba7877..add1e09fdc 100644
--- a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
+++ b/server-core/src/main/java/io/onedev/server/util/StatusInfo.java
@@ -1,16 +1,13 @@
package io.onedev.server.util;
-import java.io.Serializable;
+import io.onedev.server.model.Build;
import javax.annotation.Nullable;
-
-import io.onedev.server.model.Build;
+import java.io.Serializable;
public class StatusInfo implements Serializable {
private static final long serialVersionUID = 1L;
-
- private final String pipeline;
private final Long requestId;
@@ -18,18 +15,12 @@ public class StatusInfo implements Serializable {
private final Build.Status status;
- public StatusInfo(Build.Status status, @Nullable String pipeline, @Nullable Long requestId, @Nullable String refName) {
+ public StatusInfo(Build.Status status, @Nullable Long requestId, @Nullable String refName) {
this.status = status;
- this.pipeline = pipeline;
this.requestId = requestId;
this.refName = refName;
}
- @Nullable
- public String getPipeline() {
- return pipeline;
- }
-
@Nullable
public Long getRequestId() {
return requestId;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 1f34ee8210..e5eba97d0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -105,8 +105,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (fieldElements.isEmpty()) {
if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy) {
return SuggestionUtils.suggestUsers(matchWith);
- } else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf
- || operator == BuildQueryLexer.InPipelineOf) {
+ } else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf) {
return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else if (operator == BuildQueryLexer.FixedIssue) {
return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 69ad3c756c..45842fe878 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -67,7 +67,7 @@ public abstract class CommitStatusLink extends DropdownLink {
@Override
protected Status load() {
- return Status.getOverallStatus(getProject().getCommitStatuses(commitId, null, getPullRequest(), refName).values());
+ return Status.getOverallStatus(getProject().getCommitStatuses(commitId, getPullRequest(), refName).values());
}
};
@@ -144,11 +144,6 @@ public abstract class CommitStatusLink extends DropdownLink {
protected PullRequest getPullRequest() {
return CommitStatusLink.this.getPullRequest();
}
-
- @Override
- protected String getPipeline() {
- return null;
- }
};
}
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 dc395289bb..70d7784011 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
@@ -52,8 +52,6 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
protected abstract Project getProject();
- protected abstract String getPipeline();
-
@Nullable
protected abstract PullRequest getPullRequest();
@@ -105,11 +103,10 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
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(),
+ paramMap, refName, SecurityUtils.getUser(),
getPullRequest(), null, "Submitted manually"));
}
if (builds.size() == 1)
@@ -117,7 +114,7 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
else
close();
if (builds.stream().allMatch(it -> it.isFinished()))
- Session.get().warn("Build already fired in current pipeline");
+ Session.get().warn("Build already finished. You may re-run the build");
}
@Override
@@ -138,11 +135,11 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
};
} else {
Build build = getJobManager().submit(getProject(), commitId, job.getName(),
- new HashMap<>(), getPipeline(), refNames.iterator().next(),
+ new HashMap<>(), 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");
+ Session.get().warn("Build already finished. You may re-run the build");
}
} else {
new MessageModal(target) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
index 41090fa780..063b96841c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
@@ -30,7 +30,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
import javax.annotation.Nullable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
@SuppressWarnings("serial")
public abstract class JobInfoButton extends Panel {
@@ -52,7 +55,7 @@ public abstract class JobInfoButton extends Panel {
@Override
protected List<Build> load() {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- List<Build> builds = new ArrayList<>(buildManager.query(getProject(), getCommitId(), getJobName(), getPipeline()));
+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), getCommitId(), getJobName()));
builds.sort(Comparator.comparing(Build::getNumber));
return builds;
}
@@ -64,7 +67,7 @@ public abstract class JobInfoButton extends Panel {
@Override
protected Component newListLink(String componentId) {
return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,
- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(getCommitId(), getJobName(), getPipelineOf(), null, null), 0)) {
+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(getCommitId(), getJobName(), null, null), 0)) {
@Override
protected void onConfigure() {
@@ -88,7 +91,7 @@ public abstract class JobInfoButton extends Panel {
super.onComponentTag(tag);
String cssClasses = "btn btn-outline-secondary";
- Build.Status status = getProject().getCommitStatuses(getCommitId(), getPipeline(), null, null).get(getJobName());
+ Build.Status status = getProject().getCommitStatuses(getCommitId(), null, null).get(getJobName());
String title;
if (status != null) {
if (status != Status.SUCCESSFUL)
@@ -109,7 +112,7 @@ public abstract class JobInfoButton extends Panel {
@Override
protected Status load() {
- return getProject().getCommitStatuses(getCommitId(), getPipeline(), null, null).get(getJobName());
+ return getProject().getCommitStatuses(getCommitId(), null, null).get(getJobName());
}
}));
@@ -128,7 +131,7 @@ public abstract class JobInfoButton extends Panel {
detailLink.setOutputMarkupId(true);
add(detailLink);
- String refName = getPipelineOf()!=null?getPipelineOf().getRefName():null;
+ String refName = getActiveBuild()!=null?getActiveBuild().getRefName():null;
add(new RunJobLink("run", getCommitId(), getJobName(), refName) {
@Override
@@ -140,14 +143,6 @@ public abstract class JobInfoButton extends Panel {
protected PullRequest getPullRequest() {
return null;
}
-
- @Override
- protected String getPipeline() {
- if (getPipelineOf() != null)
- return getPipelineOf().getPipeline();
- else
- return UUID.randomUUID().toString();
- }
});
}
@@ -164,19 +159,9 @@ public abstract class JobInfoButton extends Panel {
protected abstract String getJobName();
- @Nullable
- private String getPipeline() {
- return getPipelineOf()!=null? getPipelineOf().getPipeline(): null;
- }
-
@Nullable
protected Build getActiveBuild() {
return null;
}
- @Nullable
- protected Build getPipelineOf() {
- return null;
- }
-
}
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 fb9f3a14b5..dc8f01e6f4 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
@@ -62,9 +62,6 @@ public abstract class JobListPanel extends Panel {
protected abstract Project getProject();
- @Nullable
- protected abstract String getPipeline();
-
@Nullable
protected abstract PullRequest getPullRequest();
@@ -88,7 +85,7 @@ public abstract class JobListPanel extends Panel {
add(jobsView);
for (Job job: accessibleJobsModel.getObject()) {
WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());
- Status status = getProject().getCommitStatuses(commitId, null, getPullRequest(), refName).get(job.getName());
+ Status status = getProject().getCommitStatuses(commitId, getPullRequest(), refName).get(job.getName());
Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {
@@ -118,19 +115,11 @@ public abstract class JobListPanel extends Panel {
protected PullRequest getPullRequest() {
return JobListPanel.this.getPullRequest();
}
-
- @Override
- protected String getPipeline() {
- String pipeline = JobListPanel.this.getPipeline();
- if (pipeline == null)
- pipeline = UUID.randomUUID().toString();
- return pipeline;
- }
});
jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), null, refName, getPullRequest()), 0)) {
+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), refName, getPullRequest()), 0)) {
@Override
protected void onConfigure() {
@@ -147,7 +136,7 @@ public abstract class JobListPanel extends Panel {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
List<Build> builds = new ArrayList<>(buildManager.query(getProject(),
commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),
- null, new HashMap<>(), getPipeline()));
+ null, new HashMap<>()));
builds.sort(Comparator.comparing(Build::getNumber));
return builds;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java
index 69d0d0fff2..6cda349906 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
-import java.util.UUID;
public abstract class JobRunSelector extends Panel {
@@ -165,11 +164,6 @@ public abstract class JobRunSelector extends Panel {
return JobRunSelector.this.getProject();
}
- @Override
- protected String getPipeline() {
- return UUID.randomUUID().toString();
- }
-
@Nullable
@Override
protected PullRequest getPullRequest() {
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 46b832e2ad..d4206e7f33 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
@@ -1,44 +1,6 @@
package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveElementIndex;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getPosition;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getSelection;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getUrlSegment;
-
-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;
-import javax.validation.Validator;
-
-import io.onedev.server.model.support.build.JobProperty;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.eclipse.jgit.lib.FileMode;
-import org.unbescape.html.HtmlEscape;
-
import com.google.common.base.Throwables;
-
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
@@ -51,6 +13,7 @@ import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.asset.icon.IconScope;
@@ -67,6 +30,36 @@ import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.eclipse.jgit.lib.FileMode;
+import org.unbescape.html.HtmlEscape;
+
+import javax.annotation.Nullable;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.*;
@SuppressWarnings("serial")
public class BuildSpecBlobViewPanel extends BlobViewPanel {
@@ -250,11 +243,6 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
protected PullRequest getPullRequest() {
return null;
}
-
- @Override
- protected String getPipeline() {
- return UUID.randomUUID().toString();
- }
});
jobNav.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));
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 2820750212..994f954d55 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
@@ -141,7 +141,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
Map<Integer, CoverageStatus> coverages = new HashMap<>();
var lines = context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines();
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (var build: buildManager.query(project, commitId, null, null, null, null, new HashMap<>(), null)) {
+ for (var build: buildManager.query(project, commitId, null, null, null, null, new HashMap<>())) {
for (var contribution: OneDev.getExtensions(CodeProblemContribution.class))
problems.addAll(contribution.getCodeProblems(build, path, context.getProblemReport()));
for (var contribution: OneDev.getExtensions(LineCoverageContribution.class)) {
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 830a7dcd66..6945eb25e1 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
@@ -373,11 +373,6 @@ public abstract class BuildDetailPage extends ProjectPage
return getBuild().getRequest();
}
- @Override
- protected String getPipeline() {
- return getBuild().getPipeline();
- }
-
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
index d5fb5db2b5..5bd0e0eaed 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
@@ -69,11 +69,6 @@ public class BuildPipelinePage extends BuildDetailPage {
return getBuild();
}
- @Override
- protected Build getPipelineOf() {
- return getBuild();
- }
-
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index d564af93da..fc4bb547c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -654,11 +654,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return PullRequestDetailPage.this.getProject();
}
- @Override
- protected String getPipeline() {
- return UUID.randomUUID().toString();
- }
-
@Nullable
@Override
protected PullRequest getPullRequest() {