Skip to content

The Unified and Autonomous Development Platform

feat(build): configure dependency rebuild scope

Chief Work Horseb2acd78f446e
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.java
index a52c75d07a..75add3d360 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
@@ -2809,4 +2809,22 @@ public class BuildSpec implements Serializable, Validatable {
});
}
+ @SuppressWarnings("unused")
+ private void migrate53(VersionedYamlDoc doc, Stack<Integer> versions) {
+ for (NodeTuple specTuple : doc.getValue()) {
+ if (((ScalarNode) specTuple.getKeyNode()).getValue().equals("jobs")) {
+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();
+ for (Node jobNodeItem : jobsNode.getValue()) {
+ MappingNode jobNode = (MappingNode) jobNodeItem;
+ jobNode.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "includeUpstreamWhenRebuild"),
+ new ScalarNode(Tag.BOOL, "false")));
+ jobNode.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "includeDownstreamWhenRebuild"),
+ new ScalarNode(Tag.BOOL, "false")));
+ }
+ }
+ }
+ }
+
}
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 3c3009c24b..f4ae5acf13 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
@@ -110,6 +110,10 @@ public class Job implements NamedElement, Validatable {
private int maxRetries = 3;
private int retryDelay = 30;
+
+ private boolean includeUpstreamWhenRebuild;
+
+ private boolean includeDownstreamWhenRebuild;
private transient Map<String, ParamSpec> paramSpecMap;
@@ -307,6 +311,24 @@ public class Job implements NamedElement, Validatable {
public void setRetryDelay(int retryDelay) {
this.retryDelay = retryDelay;
}
+
+ @Editable(order=9430, group="More Settings", description="Whether or not to also rebuild upstream jobs when rebuilding this job")
+ public boolean isIncludeUpstreamWhenRebuild() {
+ return includeUpstreamWhenRebuild;
+ }
+
+ public void setIncludeUpstreamWhenRebuild(boolean includeUpstreamWhenRebuild) {
+ this.includeUpstreamWhenRebuild = includeUpstreamWhenRebuild;
+ }
+
+ @Editable(order=9440, group="More Settings", description="Whether or not to also rebuild downstream jobs when rebuilding this job")
+ public boolean isIncludeDownstreamWhenRebuild() {
+ return includeDownstreamWhenRebuild;
+ }
+
+ public void setIncludeDownstreamWhenRebuild(boolean includeDownstreamWhenRebuild) {
+ this.includeDownstreamWhenRebuild = includeDownstreamWhenRebuild;
+ }
@Editable(order=10500, group="More Settings", description="Specify timeout in seconds. It counts from " +
"the time when job is submitted")
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index 0d0917516e..fd716e5e5c 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -821,6 +821,18 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
@Transactional
@Override
public void resubmit(User user, Build build, String reason) {
+ if (doResubmit(user, build, reason)) {
+ var job = build.getJob();
+ if (job.isIncludeUpstreamWhenRebuild())
+ resubmitUpstreamBuilds(build);
+ else
+ resubmitRequiredDependencyBuilds(build);
+ if (job.isIncludeDownstreamWhenRebuild())
+ resubmitDownstreamBuilds(build);
+ }
+ }
+
+ private boolean doResubmit(User user, Build build, String reason) {
if (build.isFinished()) {
JobAuthorizationContext.push(build.getJobAuthorizationContext());
try {
@@ -862,12 +874,38 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
} finally {
JobAuthorizationContext.pop();
}
+ return true;
+ }
+ return false;
+ }
+
+ private void resubmitRequiredDependencyBuilds(Build build) {
+ var systemUser = userService.getSystem();
+ for (var dependence : build.getDependencies()) {
+ var dependency = dependence.getDependency();
+ if (dependence.isRequireSuccessful() && !dependency.isSuccessful()
+ && doResubmit(systemUser, dependency, "Resubmitted by dependent build")) {
+ resubmitRequiredDependencyBuilds(dependency);
+ }
+ }
+ }
+
+ private void resubmitUpstreamBuilds(Build build) {
+ var systemUser = userService.getSystem();
+ for (var dependence : build.getDependencies()) {
+ var dependency = dependence.getDependency();
+ if (doResubmit(systemUser, dependency, "Resubmitted by dependent build"))
+ resubmitUpstreamBuilds(dependency);
+ }
+ }
- var systemUser = userService.getSystem();
- for (var dependence : build.getDependencies()) {
- var dependency = dependence.getDependency();
- if (dependence.isRequireSuccessful() && !dependency.isSuccessful())
- resubmit(systemUser, dependency, "Resubmitted by dependent build");
+ private void resubmitDownstreamBuilds(Build build) {
+ var systemUser = userService.getSystem();
+ for (var dependence : build.getDependents()) {
+ var dependent = dependence.getDependent();
+ if (doResubmit(systemUser, dependent, "Resubmitted by dependency build")) {
+ resubmitRequiredDependencyBuilds(dependent);
+ resubmitDownstreamBuilds(dependent);
}
}
}
@@ -1519,4 +1557,4 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
return activeJobTokens;
}
-}
\ No newline at end of file
+}