Skip to content

The Unified and Autonomous Development Platform

Add job retry setting

Robin Shen293ece4ea7dd
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index a457725c40..de0a9de839 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -83,8 +83,8 @@ import io.onedev.server.cache.DefaultUserInfoManager;
import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.ci.job.DefaultJobManager;
import io.onedev.server.ci.job.JobManager;
-import io.onedev.server.ci.job.log.DefaultJobLogManager;
-import io.onedev.server.ci.job.log.JobLogManager;
+import io.onedev.server.ci.job.log.DefaultLogManager;
+import io.onedev.server.ci.job.log.LogManager;
import io.onedev.server.ci.job.log.instruction.LogInstruction;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
@@ -317,7 +317,7 @@ public class CoreModule extends AbstractPluginModule {
bind(BuildManager.class).to(DefaultBuildManager.class);
bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);
bind(JobManager.class).to(DefaultJobManager.class);
- bind(JobLogManager.class).to(DefaultJobLogManager.class);
+ bind(LogManager.class).to(DefaultLogManager.class);
bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);
bind(MailManager.class).to(DefaultMailManager.class);
bind(IssueManager.class).to(DefaultIssueManager.class);
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 d972c3f108..e4131f619f 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
@@ -53,10 +53,11 @@ import io.onedev.k8shelper.CacheInstance;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.job.log.JobLogManager;
+import io.onedev.server.ci.job.log.LogManager;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.ci.job.paramspec.SecretParam;
+import io.onedev.server.ci.job.retry.JobRetry;
import io.onedev.server.ci.job.trigger.JobTrigger;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
@@ -118,7 +119,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private final SessionManager sessionManager;
- private final JobLogManager logManager;
+ private final LogManager logManager;
private final UserManager userManager;
@@ -136,7 +137,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Inject
public DefaultJobManager(BuildManager buildManager, UserManager userManager, ListenerRegistry listenerRegistry,
- SettingManager settingManager, TransactionManager transactionManager, JobLogManager logManager,
+ SettingManager settingManager, TransactionManager transactionManager, LogManager logManager,
ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,
ProjectManager projectManager, PasswordService passwordService) {
this.settingManager = settingManager;
@@ -719,11 +720,55 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
status = Status.STOPPED;
}
+ @Listen
+ public void on(BuildSubmitted event) {
+ Build build = event.getBuild();
+ FileUtils.deleteDir(build.getPublishDir());
+ }
+
+ @Transactional
@Listen
public void on(BuildFinished event) {
- for (BuildParam param: event.getBuild().getParams()) {
- if (param.getType().equals(ParamSpec.SECRET))
- param.setValue(null);
+ Build build = event.getBuild();
+ JobRetry retry = build.getJob().getRetry();
+ if (build.willRetry()) {
+ Long buildId = build.getId();
+ int retried = build.getRetried();
+ transactionManager.runAsyncAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(retry.getRetryDelay() * (long)(Math.pow(2, retried)) * 1000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ transactionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ logger.info("Retrying build (project: {}, build number: {})...",
+ build.getProject().getName(), build.getNumber());
+ build.setRetried(retried + 1);
+ build.setStatus(Build.Status.WAITING);
+ build.setFinishDate(null);
+ build.setPendingDate(null);
+ build.setRunningDate(null);
+ build.setSubmitDate(new Date());
+ buildManager.save(build);
+ listenerRegistry.post(new BuildSubmitted(build));
+ }
+
+ });
+ }
+
+ }, SecurityUtils.getSubject());
+ } else {
+ for (BuildParam param: build.getParams()) {
+ if (param.getType().equals(ParamSpec.SECRET))
+ param.setValue(null);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
index f6e131132a..190d353283 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -25,6 +25,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.paramspec.ParamSpec;
+import io.onedev.server.ci.job.retry.JobRetry;
import io.onedev.server.ci.job.trigger.JobTrigger;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Project;
@@ -85,6 +86,8 @@ public class Job implements Serializable, Validatable {
private long timeout = 3600;
+ private JobRetry retry;
+
private transient Map<String, ParamSpec> paramSpecMap;
@Editable(order=100, description="Specify name of the job")
@@ -300,6 +303,16 @@ public class Job implements Serializable, Validatable {
this.timeout = timeout;
}
+ @Editable(order=10600, name="Retry When Failed", group="More Settings", description="Check to re-run the job upon build failure")
+ @NameOfEmptyValue("Do not retry")
+ public JobRetry getRetry() {
+ return retry;
+ }
+
+ public void setRetry(JobRetry retry) {
+ this.retry = retry;
+ }
+
public JobTrigger getMatchedTrigger(ProjectEvent event) {
for (JobTrigger trigger: getTriggers()) {
if (trigger.matches(event, this))
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java
rename to server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
index 74151a58a4..652236396e 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
@@ -52,9 +52,9 @@ import io.onedev.server.util.JobLogger;
import io.onedev.server.web.websocket.WebSocketManager;
@Singleton
-public class DefaultJobLogManager implements JobLogManager {
+public class DefaultLogManager implements LogManager {
- private static final Logger logger = LoggerFactory.getLogger(DefaultJobLogManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultLogManager.class);
private static final int MIN_CACHE_ENTRIES = 5000;
@@ -75,7 +75,7 @@ public class DefaultJobLogManager implements JobLogManager {
private final Map<Long, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
@Inject
- public DefaultJobLogManager(StorageManager storageManager, WebSocketManager webSocketManager,
+ public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager,
BuildManager buildManager) {
this.storageManager = storageManager;
this.webSocketManager = webSocketManager;
@@ -188,6 +188,39 @@ public class DefaultJobLogManager implements JobLogManager {
return "build-log: " + buildId;
}
+ @Override
+ public boolean matches(Build build, Pattern pattern) {
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
+ lock.lock();
+ try {
+ LogSnippet snippet = recentSnippets.get(build.getId());
+ if (snippet != null) {
+ for (JobLogEntry entry: snippet.entries) {
+ if (pattern.matcher(entry.getMessage()).find())
+ return true;
+ }
+ }
+
+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());
+
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ while (true) {
+ JobLogEntry entry = (JobLogEntry) ois.readObject();
+ if (pattern.matcher(entry.getMessage()).find())
+ return true;
+ }
+ } catch (EOFException e) {
+ } catch (IOException|ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return false;
+ } finally {
+ lock.unlock();
+ }
+ }
+
private List<JobLogEntry> readLogEntries(File logFile, int from, int count) {
List<JobLogEntry> entries = new ArrayList<>();
if (logFile.exists()) {
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java
rename to server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
index a632d5d67a..a3c55df830 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
@@ -3,11 +3,12 @@ package io.onedev.server.ci.job.log;
import java.io.InputStream;
import java.util.Collection;
import java.util.List;
+import java.util.regex.Pattern;
import io.onedev.server.model.Build;
import io.onedev.server.util.JobLogger;
-public interface JobLogManager {
+public interface LogManager {
JobLogger getLogger(Build build, Collection<String> jobSecrets);
@@ -27,6 +28,8 @@ public interface JobLogManager {
*/
List<JobLogEntry> readLogEntries(Build build, int offset, int count);
+ boolean matches(Build build, Pattern pattern);
+
/**
* Read specified number of log entries starting from end of the log
*
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/AndCriteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/AndCriteria.java
new file mode 100644
index 0000000000..8f5010d6f5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/AndCriteria.java
@@ -0,0 +1,26 @@
+package io.onedev.server.ci.job.retry;
+
+import java.util.List;
+
+import io.onedev.server.model.Build;
+
+public class AndCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<? extends Criteria> criterias;
+
+ public AndCriteria(List<? extends Criteria> criterias) {
+ this.criterias = criterias;
+ }
+
+ @Override
+ public boolean satisfied(Build build) {
+ for (Criteria criteria: criterias) {
+ if (!criteria.satisfied(build))
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/Criteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/Criteria.java
new file mode 100644
index 0000000000..4cd04721d2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/Criteria.java
@@ -0,0 +1,13 @@
+package io.onedev.server.ci.job.retry;
+
+import java.io.Serializable;
+
+import io.onedev.server.model.Build;
+
+public abstract class Criteria implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public abstract boolean satisfied(Build build);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/ErrorMessageCriteria.java
new file mode 100644
index 0000000000..deed8762d7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/ErrorMessageCriteria.java
@@ -0,0 +1,22 @@
+package io.onedev.server.ci.job.retry;
+
+import java.util.regex.Pattern;
+
+import io.onedev.server.model.Build;
+
+public class ErrorMessageCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public ErrorMessageCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public boolean satisfied(Build build) {
+ return Pattern.compile(value).matcher(build.getStatusMessage()).find();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
new file mode 100644
index 0000000000..716e0a27b5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/JobRetry.java
@@ -0,0 +1,51 @@
+package io.onedev.server.ci.job.retry;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.RetryCondition;
+
+@Editable
+public class JobRetry implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String retryCondition;
+
+ private int maxRetries = 3;
+
+ private int retryDelay = 30;
+
+ @Editable(order=100, description="Specify the condition to retry the failed build")
+ @NotEmpty
+ @RetryCondition
+ public String getRetryCondition() {
+ return retryCondition;
+ }
+
+ public void setRetryCondition(String retryCondition) {
+ this.retryCondition = retryCondition;
+ }
+
+ @Editable(order=200, description="Maximum of retries before giving up")
+ public int getMaxRetries() {
+ return maxRetries;
+ }
+
+ public void setMaxRetries(int maxRetries) {
+ this.maxRetries = maxRetries;
+ }
+
+ @Editable(order=300, description="Delay for the first retry in seconds. Delay of subsequent "
+ + "retries will be calculated using an exponential back-off based on this delay")
+ public int getRetryDelay() {
+ return retryDelay;
+ }
+
+ public void setRetryDelay(int retryDelay) {
+ this.retryDelay = retryDelay;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/LogCriteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/LogCriteria.java
new file mode 100644
index 0000000000..45112c688a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/LogCriteria.java
@@ -0,0 +1,25 @@
+package io.onedev.server.ci.job.retry;
+
+import java.util.regex.Pattern;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.ci.job.log.LogManager;
+import io.onedev.server.model.Build;
+
+public class LogCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public LogCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public boolean satisfied(Build build) {
+ Pattern pattern = Pattern.compile(value);
+ return OneDev.getInstance(LogManager.class).matches(build, pattern);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/NotCriteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/NotCriteria.java
new file mode 100644
index 0000000000..338d808ab2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/NotCriteria.java
@@ -0,0 +1,20 @@
+package io.onedev.server.ci.job.retry;
+
+import io.onedev.server.model.Build;
+
+public class NotCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Criteria criteria;
+
+ public NotCriteria(Criteria criteria) {
+ this.criteria = criteria;
+ }
+
+ @Override
+ public boolean satisfied(Build build) {
+ return !criteria.satisfied(build);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/OrCriteria.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/OrCriteria.java
new file mode 100644
index 0000000000..fd446fcc39
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/OrCriteria.java
@@ -0,0 +1,26 @@
+package io.onedev.server.ci.job.retry;
+
+import java.util.List;
+
+import io.onedev.server.model.Build;
+
+public class OrCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<? extends Criteria> criterias;
+
+ public OrCriteria(List<? extends Criteria> criterias) {
+ this.criterias = criterias;
+ }
+
+ @Override
+ public boolean satisfied(Build build) {
+ for (Criteria criteria: criterias) {
+ if (criteria.satisfied(build))
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.g4 b/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.g4
new file mode 100644
index 0000000000..ee044c8ae5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.g4
@@ -0,0 +1,49 @@
+grammar RetryCondition;
+
+condition
+ : WS* criteria WS* EOF
+ ;
+
+criteria
+ : criteriaField=Quoted WS+ operator=Contains WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteria WS+ And WS+ criteria #AndCriteria
+ | criteria WS+ Or WS+ criteria #OrCriteria
+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | LParens WS* criteria WS* RParens #ParensCriteria
+ ;
+
+Contains
+ : 'contains'
+ ;
+
+And
+ : 'and'
+ ;
+
+Or
+ : 'or'
+ ;
+
+Not
+ : 'not'
+ ;
+
+LParens
+ : '('
+ ;
+
+RParens
+ : ')'
+ ;
+
+Quoted
+ : '"' ('\\'.|~[\\"])+? '"'
+ ;
+
+WS
+ : ' '
+ ;
+
+Identifier
+ : [a-zA-Z0-9:_/\\+\-;]+
+ ;
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.java b/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.java
new file mode 100644
index 0000000000..e1e87fccb2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/retry/RetryCondition.java
@@ -0,0 +1,148 @@
+package io.onedev.server.ci.job.retry;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
+import io.onedev.commons.codeassist.AntlrUtils;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneException;
+import io.onedev.server.ci.job.retry.RetryConditionParser.AndCriteriaContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.ConditionContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.CriteriaContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.NotCriteriaContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.OrCriteriaContext;
+import io.onedev.server.ci.job.retry.RetryConditionParser.ParensCriteriaContext;
+import io.onedev.server.model.Build;
+
+public class RetryCondition implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String FIELD_LOG = "Log";
+
+ public static final String FIELD_ERROR_MESSAGE = "Error Message";
+
+ private final Criteria criteria;
+
+ public RetryCondition(Criteria criteria) {
+ this.criteria = criteria;
+ }
+
+ private static String getValue(String token) {
+ return StringUtils.unescape(FenceAware.unfence(token));
+ }
+
+ public boolean satisfied(Build build) {
+ return criteria.satisfied(build);
+ }
+
+ public static RetryCondition parse(String conditionString) {
+ CharStream is = CharStreams.fromString(conditionString);
+ RetryConditionLexer lexer = new RetryConditionLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed condition syntax", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ RetryConditionParser parser = new RetryConditionParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ ConditionContext conditionContext;
+ try {
+ conditionContext = parser.condition();
+ } catch (Exception e) {
+ if (e instanceof OneException)
+ throw e;
+ else
+ throw new OneException("Malformed condition syntax", e);
+ }
+
+ Criteria criteria = new RetryConditionBaseVisitor<Criteria>() {
+
+ @Override
+ public Criteria visitParensCriteria(ParensCriteriaContext ctx) {
+ return visit(ctx.criteria());
+ }
+
+ @Override
+ public Criteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = getValue(ctx.Quoted(0).getText());
+ String value = getValue(ctx.Quoted(1).getText());
+ int operator = ctx.operator.getType();
+ checkField(fieldName, operator);
+
+ switch (operator) {
+ case RetryConditionLexer.Contains:
+ switch (fieldName) {
+ case FIELD_LOG:
+ return new LogCriteria(value);
+ case FIELD_ERROR_MESSAGE:
+ return new ErrorMessageCriteria(value);
+ default:
+ throw new IllegalStateException();
+ }
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ @Override
+ public Criteria visitOrCriteria(OrCriteriaContext ctx) {
+ List<Criteria> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrCriteria(childCriterias);
+ }
+
+ @Override
+ public Criteria visitAndCriteria(AndCriteriaContext ctx) {
+ List<Criteria> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndCriteria(childCriterias);
+ }
+
+ @Override
+ public Criteria visitNotCriteria(NotCriteriaContext ctx) {
+ return new NotCriteria(visit(ctx.criteria()));
+ }
+
+ }.visit(conditionContext.criteria());
+
+ return new RetryCondition(criteria);
+ }
+
+ public static void checkField(String fieldName, int operator) {
+ if (!fieldName.equals(FIELD_ERROR_MESSAGE) && !fieldName.equals(FIELD_LOG))
+ throw new OneException("Field not found: " + fieldName);
+ switch (operator) {
+ case RetryConditionLexer.Contains:
+ if (!fieldName.equals(FIELD_LOG) && !fieldName.equals(FIELD_ERROR_MESSAGE))
+ throw newOperatorException(fieldName, operator);
+ break;
+ }
+ }
+
+ private static OneException newOperatorException(String fieldName, int operator) {
+ return new OneException("Field '" + fieldName + "' is not applicable for operator '"
+ + AntlrUtils.getLexerRuleName(RetryConditionLexer.ruleNames, operator) + "'");
+ }
+
+}
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 5a15ebcafe..367858ae9d 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
@@ -42,7 +42,6 @@ import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
-import io.onedev.server.event.build.BuildSubmitted;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.model.Build;
@@ -279,12 +278,6 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
- @Listen
- public void on(BuildSubmitted event) {
- Build build = event.getBuild();
- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));
- }
-
@Sessional
@Override
public Map<ObjectId, Map<String, Status>> queryStatus(Project project, Collection<ObjectId> commitIds) {
@@ -361,7 +354,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
if (query == null) {
try {
String queryString = project.getBuildSetting().getBuildsToPreserve();
- query = Optional.of(BuildQuery.parse(project, queryString, true));
+ query = Optional.of(BuildQuery.parse(project, queryString));
if (query.get().needsLogin())
throw new OneException("This query needs login which is not supported here");
} catch (Exception e) {
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 0eb808be79..740c196d82 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
@@ -57,6 +57,8 @@ import io.onedev.server.ci.job.VariableInterpolator;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.ci.job.paramspec.SecretParam;
+import io.onedev.server.ci.job.retry.JobRetry;
+import io.onedev.server.ci.job.retry.RetryCondition;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.support.inputspec.SecretInput;
@@ -149,6 +151,8 @@ public class Build extends AbstractEntity implements Referenceable {
private Date finishDate;
+ private int retried;
+
@Column(length=MAX_STATUS_MESSAGE_LEN)
private String statusMessage;
@@ -175,6 +179,8 @@ public class Build extends AbstractEntity implements Referenceable {
private transient Job job;
+ private transient Boolean willRetry;
+
public Project getProject() {
return project;
}
@@ -307,6 +313,14 @@ public class Build extends AbstractEntity implements Referenceable {
this.finishDate = finishDate;
}
+ public int getRetried() {
+ return retried;
+ }
+
+ public void setRetried(int retried) {
+ this.retried = retried;
+ }
+
public Collection<BuildParam> getParams() {
return params;
}
@@ -650,4 +664,14 @@ public class Build extends AbstractEntity implements Referenceable {
return Build.class.getName() + ":" + buildId;
}
+ public boolean willRetry() {
+ if (willRetry == null) {
+ JobRetry retry = getJob().getRetry();
+ willRetry = getStatus() == Build.Status.FAILED
+ && retry != null
+ && getRetried() < retry.getMaxRetries()
+ && RetryCondition.parse(retry.getRetryCondition()).satisfied(this);
+ }
+ return willRetry;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 3ed9fa446e..4d0d69f064 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -94,7 +94,7 @@ public class PullRequestNotificationManager implements PersistListener {
@Override
protected EntityQuery<PullRequest> parse(String queryString) {
- return PullRequestQuery.parse(request.getTargetProject(), queryString, true);
+ return PullRequestQuery.parse(request.getTargetProject(), queryString);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 419b743241..ce3d4d2ffa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -14,7 +14,6 @@ import com.google.common.base.Splitter;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildManager;
@@ -160,17 +159,4 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
}
}
- public static String getLexerRuleName(String[] lexerRuleNames, int rule) {
- return WordUtils.uncamel(lexerRuleNames[rule-1]).toLowerCase();
- }
-
- public static int getLexerRule(String[] lexerRuleNames, String lexerRuleName) {
- for (int i=0; i<lexerRuleNames.length; i++) {
- String each = lexerRuleNames[i];
- if (WordUtils.uncamel(each).toLowerCase().equals(lexerRuleName))
- return i+1;
- }
- throw new OneException("Unable to find lexer rule: " + lexerRuleName);
- }
-
}
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 3d8101f71f..ad0583c74a 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
@@ -24,6 +24,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
+import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.cache.CacheManager;
@@ -65,7 +66,7 @@ public class BuildQuery extends EntityQuery<Build> {
this(null, new ArrayList<>());
}
- public static BuildQuery parse(Project project, @Nullable String queryString, boolean validate) {
+ public static BuildQuery parse(Project project, @Nullable String queryString) {
if (queryString != null) {
CharStream is = CharStreams.fromString(queryString);
BuildQueryLexer lexer = new BuildQueryLexer(is);
@@ -157,8 +158,7 @@ public class BuildQuery extends EntityQuery<Build> {
String fieldName = getValue(ctx.Quoted(0).getText());
String value = getValue(ctx.Quoted(1).getText());
int operator = ctx.operator.getType();
- if (validate)
- checkField(project, fieldName, operator);
+ checkField(project, fieldName, operator);
switch (operator) {
case BuildQueryLexer.IsBefore:
@@ -224,7 +224,7 @@ public class BuildQuery extends EntityQuery<Build> {
List<EntitySort> buildSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (validate && !BuildConstants.ORDER_FIELDS.containsKey(fieldName))
+ if (!BuildConstants.ORDER_FIELDS.containsKey(fieldName))
throw new OneException("Can not order by field: " + fieldName);
EntitySort commentSort = new EntitySort();
@@ -274,11 +274,11 @@ public class BuildQuery extends EntityQuery<Build> {
}
public static String getRuleName(int rule) {
- return getLexerRuleName(BuildQueryLexer.ruleNames, rule);
+ return AntlrUtils.getLexerRuleName(BuildQueryLexer.ruleNames, rule);
}
public static int getOperator(String operatorName) {
- return getLexerRule(BuildQueryLexer.ruleNames, operatorName);
+ return AntlrUtils.getLexerRule(BuildQueryLexer.ruleNames, operatorName);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 29450e730e..8de01d3ce9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -21,6 +21,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
+import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.server.OneException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
@@ -60,7 +61,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
this(null, new ArrayList<>());
}
- public static CodeCommentQuery parse(Project project, @Nullable String queryString, boolean validate) {
+ public static CodeCommentQuery parse(Project project, @Nullable String queryString) {
if (queryString != null) {
CharStream is = CharStreams.fromString(queryString);
CodeCommentQueryLexer lexer = new CodeCommentQueryLexer(is);
@@ -117,8 +118,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
String fieldName = getValue(ctx.Quoted(0).getText());
String value = getValue(ctx.Quoted(1).getText());
int operator = ctx.operator.getType();
- if (validate)
- checkField(project, fieldName, operator);
+ checkField(project, fieldName, operator);
switch (operator) {
case CodeCommentQueryLexer.IsBefore:
@@ -187,7 +187,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
List<EntitySort> commentSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (validate && !CodeCommentConstants.ORDER_FIELDS.containsKey(fieldName))
+ if (!CodeCommentConstants.ORDER_FIELDS.containsKey(fieldName))
throw new OneException("Can not order by field: " + fieldName);
EntitySort commentSort = new EntitySort();
@@ -235,11 +235,11 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
}
public static String getRuleName(int rule) {
- return getLexerRuleName(CodeCommentQueryLexer.ruleNames, rule);
+ return AntlrUtils.getLexerRuleName(CodeCommentQueryLexer.ruleNames, rule);
}
public static int getOperator(String operatorName) {
- return getLexerRule(CodeCommentQueryLexer.ruleNames, operatorName);
+ return AntlrUtils.getLexerRule(CodeCommentQueryLexer.ruleNames, operatorName);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 71bb26f06d..c3caa00404 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -33,6 +33,7 @@ import org.antlr.v4.runtime.Recognizer;
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SettingManager;
@@ -436,11 +437,11 @@ public class IssueQuery extends EntityQuery<Issue> {
}
public static String getRuleName(int rule) {
- return getLexerRuleName(IssueQueryLexer.ruleNames, rule);
+ return AntlrUtils.getLexerRuleName(IssueQueryLexer.ruleNames, rule);
}
public static int getOperator(String operatorName) {
- return getLexerRule(IssueQueryLexer.ruleNames, operatorName);
+ return AntlrUtils.getLexerRule(IssueQueryLexer.ruleNames, operatorName);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index bcbb1760cb..592977e393 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -14,6 +14,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
+import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.ProjectManager;
@@ -52,7 +53,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
this(null, new ArrayList<>());
}
- public static PullRequestQuery parse(Project project, @Nullable String queryString, boolean validate) {
+ public static PullRequestQuery parse(Project project, @Nullable String queryString) {
if (queryString != null) {
CharStream is = CharStreams.fromString(queryString);
PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);
@@ -151,8 +152,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
String fieldName = getValue(ctx.Quoted(0).getText());
String value = getValue(ctx.Quoted(1).getText());
int operator = ctx.operator.getType();
- if (validate)
- checkField(project, fieldName, operator);
+ checkField(project, fieldName, operator);
switch (operator) {
case PullRequestQueryLexer.IsBefore:
@@ -243,7 +243,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
List<EntitySort> requestSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (validate && !PullRequestConstants.ORDER_FIELDS.containsKey(fieldName))
+ if (!PullRequestConstants.ORDER_FIELDS.containsKey(fieldName))
throw new OneException("Can not order by field: " + fieldName);
EntitySort requestSort = new EntitySort();
@@ -303,11 +303,11 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
}
public static String getRuleName(int rule) {
- return getLexerRuleName(PullRequestQueryLexer.ruleNames, rule);
+ return AntlrUtils.getLexerRuleName(PullRequestQueryLexer.ruleNames, rule);
}
public static int getOperator(String operatorName) {
- return getLexerRule(PullRequestQueryLexer.ruleNames, operatorName);
+ return AntlrUtils.getLexerRule(PullRequestQueryLexer.ruleNames, operatorName);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4 b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4
index 5d90ab4484..ccf99ea1c3 100644
--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4
+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4
@@ -9,6 +9,3 @@ NQuoted: ('\\'.|~[-\\" ])('\\'.|~[\\" ])*;
Excluded: '-';
WS: ' ';
-
-fragment
-ESCAPE: '\\'[\\"];
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
index cb87f6c691..3e81df0868 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
@@ -28,7 +28,7 @@ public class BuildQueryValidator implements ConstraintValidator<BuildQuery, Stri
Project project = Project.get();
try {
io.onedev.server.search.entity.build.BuildQuery buildQuery =
- io.onedev.server.search.entity.build.BuildQuery.parse(project, value, true);
+ io.onedev.server.search.entity.build.BuildQuery.parse(project, value);
if (noLoginSupport && buildQuery.needsLogin()) {
String message = this.message;
if (message.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
index 95c09e4917..e2657e1569 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
@@ -23,7 +23,7 @@ public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommen
} else {
Project project = Project.get();
try {
- io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value, true);
+ io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
index d60ebcbee6..e62a1a30dd 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
@@ -23,7 +23,7 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullReques
} else {
Project project = Project.get();
try {
- io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value, true);
+ io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/RetryConditionValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/RetryConditionValidator.java
new file mode 100644
index 0000000000..f2c662c2ce
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/RetryConditionValidator.java
@@ -0,0 +1,42 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.editable.annotation.RetryCondition;
+
+public class RetryConditionValidator implements ConstraintValidator<RetryCondition, String> {
+
+ private String message;
+
+ @Override
+ public void initialize(RetryCondition constaintAnnotation) {
+ message = constaintAnnotation.message();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ io.onedev.server.ci.job.retry.RetryCondition.parse(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = this.message;
+ if (message.length() == 0) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ message = e.getMessage();
+ else
+ message = "Malformed retry condition";
+ }
+
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java
new file mode 100644
index 0000000000..9c93eacf1a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java
@@ -0,0 +1,68 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.server.ci.job.retry.RetryCondition;
+import io.onedev.server.ci.job.retry.RetryConditionParser;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class RetryConditionBehavior extends ANTLRAssistBehavior {
+
+ public RetryConditionBehavior() {
+ super(RetryConditionParser.class, "condition", false);
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {
+
+ @Override
+ protected List<InputSuggestion> match(String matchWith) {
+ if ("criteriaField".equals(spec.getLabel())) {
+ List<String> fields = Lists.newArrayList(
+ RetryCondition.FIELD_LOG,
+ RetryCondition.FIELD_ERROR_MESSAGE);
+ return SuggestionUtils.suggest(fields, matchWith);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "quote as literal value";
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ List<String> hints = new ArrayList<>();
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if ("criteriaValue".equals(spec.getLabel())) {
+ String unmatched = terminalExpect.getUnmatchedText();
+ if (unmatched.indexOf('"') == unmatched.lastIndexOf('"')) // only when we input criteria value
+ hints.add("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java pattern</a> is expected here");
+ }
+ }
+ return hints;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index a4ecfcdaf1..ff69150fc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -89,7 +89,7 @@ public abstract class BuildListPanel extends Panel {
@Override
protected BuildQuery load() {
try {
- BuildQuery additionalQuery = BuildQuery.parse(getProject(), query, true);
+ BuildQuery additionalQuery = BuildQuery.parse(getProject(), query);
if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {
error("Please login to perform this query");
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index c37557c41e..321e485193 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -16,7 +16,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.ci.job.log.JobLogEntry;
-import io.onedev.server.ci.job.log.JobLogManager;
+import io.onedev.server.ci.job.log.LogManager;
import io.onedev.server.ci.job.log.LogSnippet;
import io.onedev.server.model.Build;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -70,8 +70,8 @@ public class BuildLogPanel extends GenericPanel<Build> {
setOutputMarkupId(true);
}
- private JobLogManager getLogManager() {
- return OneDev.getInstance(JobLogManager.class);
+ private LogManager getLogManager() {
+ return OneDev.getInstance(LogManager.class);
}
private String asJSON(Object obj) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index 3cc8bbbee4..909f644eec 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -45,6 +45,12 @@
</div>
</div>
</wicket:enclosure>
+ <wicket:enclosure child="retried">
+ <div>
+ <div class="name">Retried</div>
+ <div class="value"><span wicket:id="retried"></span></div>
+ </div>
+ </wicket:enclosure>
</div>
<wicket:enclosure child="params">
<div class="params table">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 147756a3cf..eaadcd0cd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -63,7 +63,7 @@ public abstract class BuildSidePanel extends Panel {
@Override
protected EntityQuery<Build> parse(String queryString) {
- return BuildQuery.parse(getProject(), queryString, true);
+ return BuildQuery.parse(getProject(), queryString);
}
@Override
@@ -128,6 +128,9 @@ public abstract class BuildSidePanel extends Panel {
});
+ general.add(new Label("retried", String.valueOf(getBuild().getRetried()))
+ .setVisible(getBuild().getRetried() != 0));
+
general.add(new Label("submitDate", new LoadableDetachableModel<String>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 486ad7b102..3ded5e28ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -76,7 +76,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
protected CodeCommentQuery load() {
try {
- CodeCommentQuery parsedQuery = CodeCommentQuery.parse(getProject(), query, true);
+ CodeCommentQuery parsedQuery = CodeCommentQuery.parse(getProject(), query);
if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())
error("Please login to perform this query");
else
diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
index e605dac049..6865cbfe9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
@@ -17,7 +17,7 @@ import org.apache.wicket.request.resource.AbstractResource;
import com.google.common.base.Charsets;
import io.onedev.server.OneDev;
-import io.onedev.server.ci.job.log.JobLogManager;
+import io.onedev.server.ci.job.log.LogManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
@@ -75,7 +75,7 @@ public class BuildLogDownloadResource extends AbstractResource {
@Override
public void writeData(Attributes attributes) throws IOException {
- try (InputStream is = OneDev.getInstance(JobLogManager.class).openLogStream(build)) {
+ try (InputStream is = OneDev.getInstance(LogManager.class).openLogStream(build)) {
IOUtils.copy(is, attributes.getResponse().getOutputStream());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/RetryCondition.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RetryCondition.java
new file mode 100644
index 0000000000..8abea4aed5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RetryCondition.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.RetryConditionValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=RetryConditionValidator.class)
+public @interface RetryCondition {
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+ boolean noLoginSupport() default false;
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditSupport.java
new file mode 100644
index 0000000000..6efc70283c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditSupport.java
@@ -0,0 +1,63 @@
+package io.onedev.server.web.editable.retrycondition;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+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.RetryCondition;
+
+@SuppressWarnings("serial")
+public class RetryConditionEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(RetryCondition.class) != null) {
+ if (propertyGetter.getReturnType() != String.class) {
+ throw new RuntimeException("Annotation 'RetryCondition' should be applied to property "
+ + "with type 'String'");
+ }
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ String refMatch = model.getObject();
+ if (refMatch != null) {
+ return new Label(id, refMatch);
+ } else {
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new RetryConditionEditor(componentId, descriptor, model);
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.html
new file mode 100644
index 0000000000..1b6893780c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.html
@@ -0,0 +1,5 @@
+<wicket:panel>
+ <div class="clearable-wrapper">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.java
new file mode 100644
index 0000000000..480c3337d1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/retrycondition/RetryConditionEditor.java
@@ -0,0 +1,48 @@
+package io.onedev.server.web.editable.retrycondition;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.behavior.RetryConditionBehavior;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+
+@SuppressWarnings("serial")
+public class RetryConditionEditor extends PropertyEditor<String> {
+
+ private TextField<String> input;
+
+ public RetryConditionEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new TextField<String>("input", getModel());
+ input.add(new RetryConditionBehavior());
+
+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
+
+ add(input);
+ input.add(new OnTypingDoneBehavior() {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+
+ });
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 4dcd1218ef..741faa87b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -52,7 +52,7 @@ public class ProjectBuildsPage extends ProjectPage {
query = null;
for (String each: queries) {
try {
- if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each, true).needsLogin()) {
+ if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each).needsLogin()) {
query = each;
break;
}
@@ -85,7 +85,7 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
protected boolean needsLogin(NamedBuildQuery namedQuery) {
- return BuildQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();
+ return BuildQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();
}
@Override
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 3d07444cee..b3f6d82066 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
@@ -89,6 +89,8 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex
private final QueryPosition position;
+ private int retried;
+
public BuildDetailPage(PageParameters params) {
super(params);
@@ -122,8 +124,12 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex
@Override
public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
- handler.add(component);
- handler.appendJavaScript("$(window).resize();");
+ if (getBuild().getRetried() != retried) {
+ setResponsePage(getPage().getClass(), paramsOf(getBuild(), position));
+ } else {
+ handler.add(component);
+ handler.appendJavaScript("$(window).resize();");
+ }
}
@Override
@@ -144,6 +150,8 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex
protected void onInitialize() {
super.onInitialize();
+ retried = getBuild().getRetried();
+
WebMarkupContainer summary = new WebMarkupContainer("summary");
summary.add(newBuildObserver(getBuild().getId()));
summary.setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index ddec7b417d..246b58617a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -52,7 +52,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
queries.add(namedQuery.getQuery());
for (String each: queries) {
try {
- if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each, true).needsLogin()) {
+ if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each).needsLogin()) {
query = each;
break;
}
@@ -80,7 +80,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
@Override
protected boolean needsLogin(NamedCodeCommentQuery namedQuery) {
- return CodeCommentQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();
+ return CodeCommentQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 6b65d95018..25335f2101 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -85,7 +85,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
protected PullRequestQuery load() {
try {
- PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query, true);
+ PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query);
if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())
error("Please login to perform this query");
else
@@ -117,7 +117,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
queries.add(namedQuery.getQuery());
for (String each: queries) {
try {
- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each, true).needsLogin()) {
+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each).needsLogin()) {
query = each;
break;
}
@@ -155,7 +155,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
protected boolean needsLogin(NamedPullRequestQuery namedQuery) {
- return PullRequestQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();
+ return PullRequestQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();
}
@Override
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 b3a0314bc0..56d9dabbe6 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
@@ -452,7 +452,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
@Override
protected EntityQuery<PullRequest> parse(String queryString) {
- return PullRequestQuery.parse(getProject(), queryString, true);
+ return PullRequestQuery.parse(getProject(), queryString);
}
@Override