Skip to content

The Unified and Autonomous Development Platform

Fix issue #861 - Retry all failed/cancelled builds

Robin Shenabcb79ffd0d6
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 7b552d7c41..c704e3900d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -912,6 +912,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} finally {
JobSecretAuthorizationContext.pop();
}
+
+ for (BuildDependence dependence: build.getDependencies()) {
+ Build dependency = dependence.getDependency();
+ if (dependence.isRequireSuccessful() && !dependency.isSuccessful())
+ resubmit(dependency, dependency.getParamMap(), "Resubmitted by dependent build");
+ }
} else {
throw new ExplicitException("Build #" + build.getNumber() + " not finished yet");
}
@@ -1080,9 +1086,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run(Map<String, List<String>> paramMap) {
- Build build = submit(project, commitId, job.getName(), paramMap, pipeline, reason);
- if (build.isFinished())
- resubmit(build, paramMap, "Resubmitted by schedule");
+ submit(project, commitId, job.getName(), paramMap, pipeline, reason);
}
}.run();
@@ -1221,11 +1225,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Listen
public void on(BuildFinished event) {
Build build = event.getBuild();
- for (BuildParam param: build.getParams()) {
- if (param.getType().equals(ParamSpec.SECRET))
- param.setValue(null);
- }
-
Long buildId = build.getId();
OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
index 77cfd2aba5..fa38e6ddb1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
@@ -191,7 +191,7 @@ public class ParamUtils {
ParamSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(property.getDisplayName()));
List<String> values = new ArrayList<>();
for (String value: paramSpec.convertToStrings(typedValue)) {
- if (paramSpec instanceof SecretParam)
+ if (paramSpec instanceof SecretParam && !value.startsWith(SecretInput.LITERAL_VALUE_PREFIX))
value = SecretInput.LITERAL_VALUE_PREFIX + value;
values.add(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
index 70533964c6..3a69e94bcb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.commons.loader.Listen;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
@@ -68,8 +67,7 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
for (Object[] fields: (List<Object[]>)query.list())
projectIds.put((Long)fields[0], (Long)fields[1]);
- query = dao.getSession().createQuery("select build.id, name from BuildParam where type != :secret");
- query.setParameter("secret", ParamSpec.SECRET);
+ query = dao.getSession().createQuery("select build.id, name from BuildParam");
for (Object[] fields: (List<Object[]>)query.list()) {
Long projectId = projectIds.get(fields[0]);
if (projectId != null)
@@ -82,24 +80,22 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
public void save(BuildParam param) {
super.save(param);
- if (!param.getType().equals(ParamSpec.SECRET)) {
- Long projectId = param.getBuild().getProject().getId();
- String paramName = param.getName();
-
- transactionManager.runAfterCommit(new Runnable() {
+ Long projectId = param.getBuild().getProject().getId();
+ String paramName = param.getName();
+
+ transactionManager.runAfterCommit(new Runnable() {
- @Override
- public void run() {
- paramNamesLock.writeLock().lock();
- try {
- addParam(projectId, paramName);
- } finally {
- paramNamesLock.writeLock().unlock();
- }
+ @Override
+ public void run() {
+ paramNamesLock.writeLock().lock();
+ try {
+ addParam(projectId, paramName);
+ } finally {
+ paramNamesLock.writeLock().unlock();
}
-
- });
- }
+ }
+
+ });
}
private void addParam(Long projectId, String paramName) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
index 7370946194..e9155db807 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
@@ -1,6 +1,8 @@
package io.onedev.server.rest;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import javax.inject.Inject;
@@ -15,12 +17,15 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.UnauthorizedException;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
+import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.rest.support.RestConstants;
@@ -60,7 +65,14 @@ public class BuildResource {
Build build = buildManager.load(buildId);
if (!SecurityUtils.canAccess(build))
throw new UnauthorizedException();
- return build.getParams();
+
+ List<BuildParam> params = SerializationUtils.clone(new ArrayList<>(build.getParams()));
+ for (Iterator<BuildParam> it = params.iterator(); it.hasNext();) {
+ BuildParam param = it.next();
+ if (param.getType().equals(ParamSpec.SECRET))
+ param.setValue(SecretInput.MASK);
+ }
+ return params;
}
@Api(order=300)
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 9ed38e2028..bbc4d8f2eb 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
@@ -58,7 +58,6 @@ import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -75,9 +74,6 @@ import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.editable.BeanDescriptor;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.annotation.Password;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;
@@ -261,33 +257,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public void onClick(AjaxRequestTarget target) {
- Build build = getBuild();
-
- Serializable paramBean = build.getParamBean();
-
- Collection<String> secretParamNames = new ArrayList<>();
- BeanDescriptor descriptor = new BeanDescriptor(paramBean.getClass());
- for (List<PropertyDescriptor> groupProperties: descriptor.getProperties().values()) {
- for (PropertyDescriptor property: groupProperties) {
- if (property.getPropertyGetter().getAnnotation(Password.class) != null
- && build.isParamVisible(property.getDisplayName())) {
- secretParamNames.add(property.getPropertyName());
- }
- }
- }
-
- if (!secretParamNames.isEmpty()) {
- new BeanEditModalPanel(target, paramBean, secretParamNames, false, "Rebuild #" + build.getNumber()) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, Serializable bean) {
- resubmit(paramBean);
- }
-
- };
- } else {
- resubmit(paramBean);
- }
+ resubmit(getBuild().getParamBean());
target.focusComponent(null);
}