Skip to content

The Unified and Autonomous Development Platform

Add "require successful" option to job dependency

Robin Shen382efa9c8685
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
index 5edef8d1be..6e3634def2 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
@@ -235,6 +235,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
+ dependence.setRequireSuccessful(dependency.isRequireSuccessful());
dependence.setArtifacts(dependency.getArtifacts());
build.getDependencies().add(dependence);
}
@@ -648,23 +649,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
markBuildError(build, "Stopped for unknown reason");
}
} else if (build.getStatus() == Build.Status.WAITING) {
- boolean hasUnsuccessful = false;
- boolean hasUnfinished = false;
-
- for (BuildDependence dependence: build.getDependencies()) {
- Build dependency = dependence.getDependency();
-
- if (dependency.getStatus() == Build.Status.SUCCESSFUL)
- continue;
- else if (dependency.isFinished())
- hasUnsuccessful = true;
- else
- hasUnfinished = true;
- }
-
- if (hasUnsuccessful) {
- markBuildError(build, "There are failed dependencies");
- } else if (!hasUnfinished) {
+ if (build.getDependencies().stream().anyMatch(it -> it.isRequireSuccessful()
+ && it.getDependency().isFinished()
+ && it.getDependency().getStatus() != Build.Status.SUCCESSFUL)) {
+ markBuildError(build, "Some dependencies are required to be successful but failed");
+ } else if (build.getDependencies().stream().allMatch(it->it.getDependency().isFinished())) {
build.setStatus(Build.Status.PENDING);
build.setPendingDate(new Date());
listenerRegistry.post(new BuildPending(build));
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java
index b5b0db0605..56d9dda180 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java
@@ -30,6 +30,8 @@ public class JobDependency implements Serializable {
private String jobName;
+ private boolean requireSuccessful = true;
+
private List<JobParam> jobParams = new ArrayList<>();
private String artifacts = "**";
@@ -46,6 +48,15 @@ public class JobDependency implements Serializable {
this.jobName = jobName;
}
+ @Editable(order=150, description="Whether or not to require this dependency to be successful")
+ public boolean isRequireSuccessful() {
+ return requireSuccessful;
+ }
+
+ public void setRequireSuccessful(boolean requireSuccessful) {
+ this.requireSuccessful = requireSuccessful;
+ }
+
@Editable(order=200)
@ParamSpecProvider("getParamSpecs")
@OmitName
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
index 6928665bf4..1a009bbc7e 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.web.editable.annotation.Editable;
-@Editable(order=500, name="When dependency jobs finished successfully")
+@Editable(order=500, name="When dependency jobs finished")
public class DependencyBuiltTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
@@ -21,18 +21,17 @@ public class DependencyBuiltTrigger extends JobTrigger {
if (event instanceof BuildFinished) {
BuildFinished buildFinished = (BuildFinished) event;
Build build = buildFinished.getBuild();
- if (build.getStatus() == Status.SUCCESSFUL) {
- for (JobDependency dependency: job.getJobDependencies()) {
- if (dependency.getJobName().equals(build.getJobName())) {
- for (JobParam param: dependency.getJobParams()) {
- if (!param.isSecret()) {
- List<String> paramValue = build.getParamMap().get(param.getName());
- if (!param.getValuesProvider().getValues().contains(paramValue))
- return false;
- }
+ for (JobDependency dependency: job.getJobDependencies()) {
+ if (dependency.getJobName().equals(build.getJobName())
+ && (!dependency.isRequireSuccessful() || build.getStatus() == Status.SUCCESSFUL)) {
+ for (JobParam param: dependency.getJobParams()) {
+ if (!param.isSecret()) {
+ List<String> paramValue = build.getParamMap().get(param.getName());
+ if (!param.getValuesProvider().getValues().contains(paramValue))
+ return false;
}
- return true;
}
+ return true;
}
}
}
@@ -41,7 +40,7 @@ public class DependencyBuiltTrigger extends JobTrigger {
@Override
public String getDescription() {
- return "When dependency jobs finished successfully";
+ return "When dependency jobs finished";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
index 5e7d8dba20..cb1be84e3a 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
@@ -34,6 +34,8 @@ public class BuildDependence extends AbstractEntity {
@JoinColumn(nullable=false)
private Build dependency;
+ private boolean requireSuccessful;
+
private String artifacts;
public Build getDependent() {
@@ -52,6 +54,14 @@ public class BuildDependence extends AbstractEntity {
this.dependency = dependency;
}
+ public boolean isRequireSuccessful() {
+ return requireSuccessful;
+ }
+
+ public void setRequireSuccessful(boolean requireSuccessful) {
+ this.requireSuccessful = requireSuccessful;
+ }
+
@Nullable
public String getArtifacts() {
return artifacts;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
index 748009ac48..4d3111c684 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
@@ -9,12 +9,12 @@ import com.google.common.collect.Lists;
import io.onedev.server.model.support.inputspec.InputSpec;
import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.web.util.LocaleUtils;
+import io.onedev.server.web.util.TextUtils;
public class BooleanInput {
public static List<String> getPossibleValues() {
- return Lists.newArrayList(LocaleUtils.describe(true), LocaleUtils.describe(false));
+ return Lists.newArrayList(TextUtils.describe(true), TextUtils.describe(false));
}
public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
@@ -35,9 +35,9 @@ public class BooleanInput {
throw new ValidationException("Invalid boolean value");
} else if (strings.size() == 1) {
String string = strings.iterator().next();
- if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(LocaleUtils.describe(true)))
+ if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(TextUtils.describe(true)))
return true;
- else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(LocaleUtils.describe(false)))
+ else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(TextUtils.describe(false)))
return false;
else
throw new ValidationException("Invalid boolean value");
@@ -48,9 +48,9 @@ public class BooleanInput {
public static List<String> convertToStrings(Object value) {
if (value instanceof Boolean)
- return Lists.newArrayList(LocaleUtils.describe((Boolean)value));
+ return Lists.newArrayList(TextUtils.describe((Boolean)value));
else
- return Lists.newArrayList(LocaleUtils.describe(false));
+ return Lists.newArrayList(TextUtils.describe(false));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
index 73382bc948..4e0625583f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.util.LocaleUtils;
+import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class BooleanEditSupport implements EditSupport {
@@ -33,7 +33,7 @@ public class BooleanEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new Label(id, LocaleUtils.describe(model.getObject()));
+ return new Label(id, TextUtils.describe(model.getObject()));
} else {
NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);
if (nameOfEmptyValue != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
index a3fd4d644e..0729d3f2d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
@@ -38,6 +38,7 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
+import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@@ -139,15 +140,12 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
});
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Artifacts to Retrieve")) {
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
JobDependency dependency = rowModel.getObject();
- if (dependency.getArtifacts() != null)
- cellItem.add(new Label(componentId, dependency.getArtifacts()));
- else
- cellItem.add(new Label(componentId, "<i>Do not retrieve</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful())));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
index 8cd74f47cb..af7cd3fccf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
@@ -29,6 +29,7 @@ import io.onedev.server.ci.job.JobDependency;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.page.layout.SideFloating.Placement;
+import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
class JobDependencyListViewPanel extends Panel {
@@ -78,7 +79,7 @@ class JobDependencyListViewPanel extends Panel {
}
});
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Artifacts to Retrieve")) {
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
@@ -87,10 +88,7 @@ class JobDependencyListViewPanel extends Panel {
@Override
protected Component newLabel(String componentId) {
JobDependency dependency = rowModel.getObject();
- if (dependency.getArtifacts() != null)
- return new Label(componentId, dependency.getArtifacts());
- else
- return new Label(componentId, "<i>Do not retrieve</i>").setEscapeModelStrings(false);
+ return new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
index 29cda11e5a..24b46e043b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
@@ -42,7 +42,7 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.util.LocaleUtils;
+import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class GroovyScriptListPage extends AdministrationPage {
@@ -134,7 +134,7 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
protected Component newLabel(String componentId) {
- return new Label(componentId, LocaleUtils.describe(script.getJobAuthorization() != null));
+ return new Label(componentId, TextUtils.describe(script.getJobAuthorization() != null));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
index e7ffa8f66f..78991c195e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
@@ -40,7 +40,7 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.util.LocaleUtils;
+import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class IssueFieldListPage extends GlobalIssueSettingPage {
@@ -146,7 +146,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {
@Override
protected Component newLabel(String componentId) {
- return new Label(componentId, LocaleUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));
+ return new Label(componentId, TextUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.java b/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
similarity index 81%
rename from server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.java
rename to server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
index dc9cfe3cd1..e14bf8d7f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/TextUtils.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.util;
-public class LocaleUtils {
+public class TextUtils {
public static String describe(boolean value) {
return value? "Yes": "No";
diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.properties
index fd771c2e1d..3f566a5696 100644
--- a/server-product/system/conf/hibernate.properties
+++ b/server-product/system/conf/hibernate.properties
@@ -118,5 +118,6 @@ hibernate.validator.apply_to_ddl=false
hibernate.cache.region.factory_class=org.hibernate.cache.jcache.JCacheRegionFactory
hibernate.cache.use_query_cache=true
+hibernate.cache.auto_evict_collection_cache=true
hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider
hibernate.javax.cache.missing_cache_strategy=create