Skip to content

The Unified and Autonomous Development Platform

Fix issue #303 - Highlight step status in build log

Robin Shen7dfd11ac3477
diff --git a/pom.xml b/pom.xml
index 29ee376788..38495a5a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,8 +563,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.13</commons.version>
- <agent.version>1.0.7</agent.version>
+ <commons.version>2.0.14</commons.version>
+ <agent.version>1.0.8</agent.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.0</logback.version>
<antlr.version>4.7.2</antlr.version>
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 1f7e8a1e91..276832a2e9 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
@@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
import org.eclipse.jgit.lib.ObjectId;
@@ -47,6 +46,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
+import io.onedev.agent.job.FailedException;
import io.onedev.commons.loader.Listen;
import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
@@ -104,7 +104,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -424,11 +423,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
try {
String jobToken = UUID.randomUUID().toString();
Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
+ TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);
BuildSpec buildSpec = build.getSpec();
Job job = build.getJob();
- TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);
JobExecutor executor = getJobExecutor(build, jobLogger);
if (executor != null) {
ObjectId commitId = ObjectId.fromString(build.getCommitHash());
@@ -442,252 +441,240 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
- try {
- AtomicInteger maxRetries = new AtomicInteger(0);
- AtomicInteger retryDelay = new AtomicInteger(0);
- List<CacheSpec> caches = new ArrayList<>();
- List<Service> services = new ArrayList<>();
- List<Action> actions = new ArrayList<>();
+ AtomicInteger maxRetries = new AtomicInteger(0);
+ AtomicInteger retryDelay = new AtomicInteger(0);
+ List<CacheSpec> caches = new ArrayList<>();
+ List<Service> services = new ArrayList<>();
+ List<Action> actions = new ArrayList<>();
+
+ sessionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ Build.push(build);
+ try {
+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
+
+ for (Step step: job.getSteps()) {
+ step = interpolator.interpolateProperties(step);
+ actions.add(step.getAction(build, jobToken, build.getParamCombination()));
+ }
+
+ for (CacheSpec cache: job.getCaches())
+ caches.add(interpolator.interpolateProperties(cache));
+
+ for (String serviceName: job.getRequiredServices()) {
+ Service service = buildSpec.getServiceMap().get(serviceName);
+ services.add(interpolator.interpolateProperties(service));
+ }
+ maxRetries.set(job.getMaxRetries());
+ retryDelay.set(job.getRetryDelay());
+ } finally {
+ Build.pop();
+ JobSecretAuthorizationContext.pop();
+ }
+ }
- sessionManager.run(new Runnable() {
+ });
+
+ AtomicInteger retried = new AtomicInteger(0);
+ while (true) {
+ JobContext jobContext = sessionManager.call(new Callable<JobContext> () {
@Override
- public void run() {
+ public JobContext call() throws Exception {
Build build = buildManager.load(buildId);
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
try {
- VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
-
- for (Step step: job.getSteps()) {
- step = interpolator.interpolateProperties(step);
- actions.add(step.getAction(build, jobToken, build.getParamCombination()));
- }
-
- for (CacheSpec cache: job.getCaches())
- caches.add(interpolator.interpolateProperties(cache));
-
- for (String serviceName: job.getRequiredServices()) {
- Service service = buildSpec.getServiceMap().get(serviceName);
- services.add(interpolator.interpolateProperties(service));
- }
- maxRetries.set(job.getMaxRetries());
- retryDelay.set(job.getRetryDelay());
- } finally {
- Build.pop();
- JobSecretAuthorizationContext.pop();
- }
- }
-
- });
+ return new JobContext(projectName, buildNumber, projectGitDir,
+ actions, job.getCpuRequirement(), job.getMemoryRequirement(),
+ commitId, caches, executor.getCacheTTL(), retried.get(),
+ services, jobLogger) {
+
+ @Override
+ public void notifyJobRunning(Long agentId) {
+ transactionManager.run(new Runnable() {
- AtomicInteger retried = new AtomicInteger(0);
- while (true) {
- JobContext jobContext = sessionManager.call(new Callable<JobContext> () {
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ build.setStatus(Build.Status.RUNNING);
+ build.setRunningDate(new Date());
+ if (agentId != null)
+ build.setAgent(agentManager.load(agentId));
+ buildManager.save(build);
+ listenerRegistry.post(new BuildRunning(build));
+ }
+
+ });
+ }
- @Override
- public JobContext call() throws Exception {
- Build build = buildManager.load(buildId);
- Build.push(build);
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
- try {
- return new JobContext(projectName, buildNumber, projectGitDir,
- actions, job.getCpuRequirement(), job.getMemoryRequirement(),
- commitId, caches, executor.getCacheTTL(), retried.get(),
- services, jobLogger) {
-
- @Override
- public void notifyJobRunning(Long agentId) {
- transactionManager.run(new Runnable() {
+ @Override
+ public void reportJobWorkspace(String jobWorkspace) {
+ transactionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setStatus(Build.Status.RUNNING);
- build.setRunningDate(new Date());
- if (agentId != null)
- build.setAgent(agentManager.load(agentId));
- buildManager.save(build);
- listenerRegistry.post(new BuildRunning(build));
- }
-
- });
- }
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ build.setJobWorkspace(jobWorkspace);
+ buildManager.save(build);
+ }
+
+ });
+ }
- @Override
- public void reportJobWorkspace(String jobWorkspace) {
- transactionManager.run(new Runnable() {
+ @Override
+ public Map<String, byte[]> doRunServerStep(List<Integer> stepPosition, File filesDir,
+ Map<String, String> placeholderValues, TaskLogger logger) {
+ return sessionManager.call(new Callable<Map<String, byte[]>>() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setJobWorkspace(jobWorkspace);
- buildManager.save(build);
- }
+ @Override
+ public Map<String, byte[]> call() {
+ Executable entryExecutable = new CompositeExecutable(getActions());
- });
- }
-
- @Override
- public Map<String, byte[]> doRunServerStep(List<Integer> stepPosition, File filesDir,
- Map<String, String> placeholderValues, TaskLogger logger) {
- return sessionManager.call(new Callable<Map<String, byte[]>>() {
+ LeafVisitor<LeafExecutable> visitor = new LeafVisitor<LeafExecutable>() {
- @Override
- public Map<String, byte[]> call() {
- Executable entryExecutable = new CompositeExecutable(getActions());
+ @Override
+ public LeafExecutable visit(LeafExecutable executable, List<Integer> position) {
+ if (position.equals(stepPosition))
+ return executable;
+ else
+ return null;
+ }
- LeafVisitor<LeafExecutable> visitor = new LeafVisitor<LeafExecutable>() {
+ };
+
+ ServerExecutable serverExecutable = (ServerExecutable) entryExecutable.traverse(visitor, new ArrayList<>());
+ ServerStep serverStep = (ServerStep) serverExecutable.getStep();
+
+ serverStep = new EditableStringTransformer(new Function<String, String>() {
- @Override
- public LeafExecutable visit(LeafExecutable executable, List<Integer> position) {
- if (position.equals(stepPosition))
- return executable;
- else
- return null;
- }
-
- };
-
- ServerExecutable serverExecutable = (ServerExecutable) entryExecutable.traverse(visitor, new ArrayList<>());
- ServerStep serverStep = (ServerStep) serverExecutable.getStep();
+ @Override
+ public String apply(String t) {
+ return replacePlaceholders(t, placeholderValues);
+ }
- serverStep = new EditableStringTransformer(new Function<String, String>() {
-
- @Override
- public String apply(String t) {
- return replacePlaceholders(t, placeholderValues);
- }
-
- }).transformProperties(serverStep, Interpolative.class);
+ }).transformProperties(serverStep, Interpolative.class);
- return serverStep.run(buildManager.load(buildId), filesDir, logger);
- }
-
- });
- }
+ return serverStep.run(buildManager.load(buildId), filesDir, logger);
+ }
+
+ });
+ }
- @Override
- public void copyDependencies(File targetDir) {
- sessionManager.run(new Runnable() {
+ @Override
+ public void copyDependencies(File targetDir) {
+ sessionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- for (BuildDependence dependence: build.getDependencies()) {
- if (dependence.getArtifacts() != null) {
- Build dependency = dependence.getDependency();
- LockUtils.read(dependency.getArtifactsLockKey(), new Callable<Void>() {
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ for (BuildDependence dependence: build.getDependencies()) {
+ if (dependence.getArtifacts() != null) {
+ Build dependency = dependence.getDependency();
+ LockUtils.read(dependency.getArtifactsLockKey(), new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- File artifactsDir = dependency.getArtifactsDir();
- if (artifactsDir.exists()) {
- PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
- int baseLen = artifactsDir.getAbsolutePath().length() + 1;
- for (File file: patternSet.listFiles(artifactsDir)) {
- try {
- FileUtils.copyFile(file, new File(targetDir, file.getAbsolutePath().substring(baseLen)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ @Override
+ public Void call() throws Exception {
+ File artifactsDir = dependency.getArtifactsDir();
+ if (artifactsDir.exists()) {
+ PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
+ int baseLen = artifactsDir.getAbsolutePath().length() + 1;
+ for (File file: patternSet.listFiles(artifactsDir)) {
+ try {
+ FileUtils.copyFile(file, new File(targetDir, file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
}
- return null;
}
-
- });
- }
+ return null;
+ }
+
+ });
}
}
-
- });
- }
-
- };
- } finally {
- Build.pop();
- JobSecretAuthorizationContext.pop();
- }
+ }
+
+ });
+ }
+
+ };
+ } finally {
+ Build.pop();
+ JobSecretAuthorizationContext.pop();
}
-
- });
+ }
- jobContexts.put(jobToken, jobContext);
- logManager.registerLogger(jobToken, jobLogger);
- try {
- executor.execute(jobToken, jobContext);
- break;
- } catch (Throwable e) {
- if (ExceptionUtils.find(e, InterruptedException.class) != null) {
- throw e;
- } else {
- if (retried.getAndIncrement() < maxRetries.get() && transactionManager.call(new Callable<Boolean>() {
+ });
+
+ jobContexts.put(jobToken, jobContext);
+ logManager.registerLogger(jobToken, jobLogger);
+
+ try {
+ executor.execute(jobToken, jobContext);
+ break;
+ } catch (Throwable e) {
+ if (e != null && ExceptionUtils.find(e, InterruptedException.class) != null) {
+ throw e;
+ } else {
+ if (retried.getAndIncrement() < maxRetries.get() && sessionManager.call(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() {
+ RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
+ return retryCondition.matches(buildManager.load(buildId));
+ }
+
+ })) {
+ log(e, jobLogger);
+ jobLogger.warning("Job will be retried after a while...");
+ transactionManager.run(new Runnable() {
@Override
- public Boolean call() {
+ public void run() {
Build build = buildManager.load(buildId);
- if (e instanceof ExplicitException)
- build.setErrorMessage(e.getMessage());
- else
- build.setErrorMessage(Throwables.getStackTraceAsString(e));
+ build.setRunningDate(null);
+ build.setPendingDate(null);
+ build.setRetryDate(new Date());
+ build.setStatus(Build.Status.WAITING);
+ listenerRegistry.post(new BuildRetrying(build));
buildManager.save(build);
- RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
- return retryCondition.matches(build);
}
- })) {
- log(e, jobLogger);
- jobLogger.warning("Job will be retried after a while...");
- transactionManager.run(new Runnable() {
+ });
+ try {
+ Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);
+ } catch (InterruptedException e2) {
+ throw new RuntimeException(e2);
+ }
+ transactionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setErrorMessage(null);
- build.setRunningDate(null);
- build.setPendingDate(null);
- build.setRetryDate(new Date());
- build.setStatus(Build.Status.WAITING);
- listenerRegistry.post(new BuildRetrying(build));
- buildManager.save(build);
- }
-
- });
- try {
- Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);
- } catch (InterruptedException e2) {
- throw e2;
+ @Override
+ public void run() {
+ JobExecution execution = executionRef.get();
+ if (execution != null)
+ execution.updateBeginTime();
+ Build build = buildManager.load(buildId);
+ build.setPendingDate(new Date());
+ build.setStatus(Build.Status.PENDING);
+ listenerRegistry.post(new BuildPending(build));
+ buildManager.save(build);
}
- transactionManager.run(new Runnable() {
-
- @Override
- public void run() {
- JobExecution execution = executionRef.get();
- if (execution != null)
- execution.updateBeginTime();
- Build build = buildManager.load(buildId);
- build.setPendingDate(new Date());
- build.setStatus(Build.Status.PENDING);
- listenerRegistry.post(new BuildPending(build));
- buildManager.save(build);
- }
-
- });
- } else {
- throw e;
- }
+
+ });
+ } else {
+ throw e;
}
- } finally {
- jobContexts.remove(jobToken);
- logManager.deregisterLogger(jobToken);
- jobContext.onJobFinished();
}
+ } finally {
+ jobContexts.remove(jobToken);
+ logManager.deregisterLogger(jobToken);
+ jobContext.onJobFinished();
}
- } catch (Throwable e) {
- throw maskSecrets(e, jobSecretsToMask);
- } finally {
- jobLogger.log("Job finished");
}
}
@@ -710,20 +697,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logger.error("Exception catched", e);
}
- private RuntimeException maskSecrets(Throwable e, Collection<String> jobSecretsToMask) {
- if (e instanceof ExplicitException) {
- String errorMessage = e.getMessage();
- for (String secret: jobSecretsToMask)
- errorMessage = StringUtils.replace(errorMessage, secret, SecretInput.MASK);
- return new ExplicitException(errorMessage);
- } else {
- String stackTrace = Throwables.getStackTraceAsString(e);
- for (String secret: jobSecretsToMask)
- stackTrace = StringUtils.replace(stackTrace, secret, SecretInput.MASK);
- return new ExplicitException(stackTrace);
- }
- }
-
@Override
public JobContext getJobContext(String jobToken, boolean mustExist) {
JobContext jobContext = jobContexts.get(jobToken);
@@ -733,7 +706,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private void markBuildError(Build build, String errorMessage) {
- build.setStatus(Build.Status.FAILED, errorMessage);
+ build.setStatus(Build.Status.FAILED);
+ logManager.newLogger(build).error(errorMessage);
build.setFinishDate(new Date());
listenerRegistry.post(new BuildFinished(build));
}
@@ -1127,6 +1101,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
execution.cancel(null);
} else if (execution.isDone()) {
it.remove();
+ TaskLogger jobLogger = logManager.newLogger(build);
try {
execution.check();
build.setStatus(Build.Status.SUCCESSFUL);
@@ -1140,13 +1115,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
build.setStatus(Build.Status.CANCELLED);
} catch (ExecutionException e) {
- if (e.getCause() instanceof ExplicitException)
- build.setStatus(Build.Status.FAILED, e.getCause().getMessage());
- else
- build.setStatus(Build.Status.FAILED, e.getMessage());
+ build.setStatus(Build.Status.FAILED);
+ ExplicitException explicitException = ExceptionUtils.find(e, ExplicitException.class);
+ if (explicitException != null)
+ jobLogger.error(explicitException.getMessage());
+ else if (ExceptionUtils.find(e, FailedException.class) == null)
+ jobLogger.error(e.getMessage());
} catch (InterruptedException e) {
} finally {
build.setFinishDate(new Date());
+ jobLogger.log("Job finished");
listenerRegistry.post(new BuildFinished(build));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
index 063f261490..7fa99d8d4d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
@@ -127,8 +127,6 @@ public class ActionCondition extends Criteria<Build> {
switch (fieldName) {
case Build.NAME_LOG:
return new LogCriteria(fieldValue);
- case Build.NAME_ERROR_MESSAGE:
- return new ErrorMessageCriteria(fieldValue);
default:
return new ParamCriteria(fieldName, fieldValue);
}
@@ -167,7 +165,7 @@ public class ActionCondition extends Criteria<Build> {
}
public static void checkField(Job job, String fieldName, int operator) {
- if (fieldName.equals(Build.NAME_ERROR_MESSAGE) || fieldName.equals(Build.NAME_LOG)) {
+ if (fieldName.equals(Build.NAME_LOG)) {
if (operator != ActionConditionLexer.Contains)
throw newOperatorException(fieldName, operator);
} else if (fieldName.equals(Build.NAME_PULL_REQUEST)) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java
deleted file mode 100644
index db808bfeef..0000000000
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.buildspec.job.action.condition;
-
-import java.util.regex.Pattern;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-
-public class ErrorMessageCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final String value;
-
- public ErrorMessageCriteria(String value) {
- this.value = value;
- }
-
- @Override
- public boolean matches(Build build) {
- return Pattern.compile(value).matcher(build.getErrorMessage()).find();
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(Build.NAME_ERROR_MESSAGE) + " "
- + ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "
- + quote(value);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java
deleted file mode 100644
index 947e49c483..0000000000
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.buildspec.job.retrycondition;
-
-import java.util.regex.Pattern;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-
-public class ErrorMessageCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final String value;
-
- public ErrorMessageCriteria(String value) {
- this.value = value;
- }
-
- @Override
- public boolean matches(Build build) {
- return Pattern.compile(value).matcher(build.getErrorMessage()).find();
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(Build.NAME_ERROR_MESSAGE) + " "
- + RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "
- + quote(value);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
index ac1092fb35..d6a6bda9e8 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
@@ -97,8 +97,6 @@ public class RetryCondition extends Criteria<Build> {
switch (fieldName) {
case Build.NAME_LOG:
return new LogCriteria(fieldValue);
- case Build.NAME_ERROR_MESSAGE:
- return new ErrorMessageCriteria(fieldValue);
default:
return new ParamCriteria(fieldName, fieldValue);
}
@@ -132,7 +130,7 @@ public class RetryCondition extends Criteria<Build> {
}
public static void checkField(Job job, String fieldName, int operator) {
- if (fieldName.equals(Build.NAME_ERROR_MESSAGE) || fieldName.equals(Build.NAME_LOG)) {
+ if (fieldName.equals(Build.NAME_LOG)) {
if (operator != RetryConditionLexer.Contains)
throw newOperatorException(fieldName, operator);
} else if (job.getParamSpecMap().containsKey(fieldName)) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
index 95bbf0f3ee..b5b3b65623 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
@@ -107,7 +107,9 @@ public class UseTemplateStep extends Step {
VariableInterpolator interpolator = new VariableInterpolator(build, newParamCombination);
for (Step step: template.getSteps()) {
step = interpolator.interpolateProperties(step);
- String actionName = step.getName() + " (" + repeat + ")";
+ String actionName = step.getName();
+ if (repeat != 1)
+ actionName += " (" + repeat + ")";
actions.add(step.getAction(actionName, build, jobToken, newParamCombination));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 535eb7653c..1a218c884f 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -2966,6 +2966,14 @@ public class DataMigrator {
}
}
dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Builds.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element errorMessageElement = element.element("errorMessage");
+ if (errorMessageElement != null)
+ errorMessageElement.detach();
+ }
+ dom.writeToFile(file, false);
}
}
}
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 89ba42e18b..789f78b7d6 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
@@ -188,8 +188,6 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_PULL_REQUEST = "request";
- public static final String NAME_ERROR_MESSAGE = "Error Message";
-
public static final String NAME_LOG = "Log";
public static final String PROP_TRIGGER_ID = "triggerId";
@@ -198,7 +196,7 @@ public class Build extends AbstractEntity implements Referenceable {
NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,
NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,
NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION,
- NAME_ERROR_MESSAGE, NAME_LOG, BuildMetric.NAME_REPORT);
+ NAME_LOG, BuildMetric.NAME_REPORT);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,
@@ -229,8 +227,6 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String ARTIFACTS_DIR = "artifacts";
- private static final int MAX_ERROR_MESSAGE_LEN = 12000;
-
public enum Status {
// Most significant status comes first, refer to getOverallStatus
WAITING, PENDING, RUNNING, FAILED, CANCELLED, TIMED_OUT, SUCCESSFUL;
@@ -311,9 +307,6 @@ public class Build extends AbstractEntity implements Referenceable {
@Column(nullable=false, length=1000)
private String submitReason;
- @Column(length=MAX_ERROR_MESSAGE_LEN)
- private String errorMessage;
-
@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)
private Collection<BuildParam> params = new ArrayList<>();
@@ -451,12 +444,7 @@ public class Build extends AbstractEntity implements Referenceable {
}
public void setStatus(Status status) {
- setStatus(status, null);
- }
-
- public void setStatus(Status status, @Nullable String errorMessage) {
this.status = status;
- setErrorMessage(errorMessage);
}
public Date getStatusDate() {
@@ -570,19 +558,6 @@ public class Build extends AbstractEntity implements Referenceable {
this.dependents = dependents;
}
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public void setErrorMessage(String errorMessage) {
- if (errorMessage != null) {
- errorMessage = StringUtils.abbreviate(errorMessage, MAX_ERROR_MESSAGE_LEN);
- for (String secretValue: getSecretValuesToMask())
- errorMessage = StringUtils.replace(errorMessage, secretValue, SecretInput.MASK);
- }
- this.errorMessage = errorMessage;
- }
-
public String getRefName() {
return refName;
}
diff --git a/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
index ad4a9698ca..d34cb9e954 100644
--- a/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
@@ -89,6 +89,11 @@ public class DefaultJobLogManager implements JobLogManager {
return new File(buildDir, LOG_FILE);
}
+ @Override
+ public TaskLogger newLogger(Build build) {
+ return newLogger(build, new ArrayList<>());
+ }
+
@Override
public TaskLogger newLogger(Build build, Collection<String> jobSecretsToMask) {
Long projectId = build.getProject().getId();
diff --git a/server-core/src/main/java/io/onedev/server/tasklog/JobLogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/JobLogManager.java
index e511688990..e6a953d2bb 100644
--- a/server-core/src/main/java/io/onedev/server/tasklog/JobLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/JobLogManager.java
@@ -15,6 +15,8 @@ public interface JobLogManager {
TaskLogger newLogger(Build build, Collection<String> jobSecrets);
+ TaskLogger newLogger(Build build);
+
/**
* Read specified number of log entries from specified build, starting from specified index
*
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
index 8ad590159e..552ff21f6b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
@@ -47,8 +47,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {
@Override
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
- List<String> fields = Lists.newArrayList(
- Build.NAME_LOG, Build.NAME_ERROR_MESSAGE, Build.NAME_PULL_REQUEST);
+ List<String> fields = Lists.newArrayList(Build.NAME_LOG, Build.NAME_PULL_REQUEST);
JobAware jobAware = getComponent().findParent(JobAware.class);
Job job = jobAware.getJob();
fields.addAll(job.getParamSpecMap().keySet());
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
index 961e272147..d002b057e2 100644
--- 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
@@ -44,9 +44,7 @@ public class RetryConditionBehavior extends ANTLRAssistBehavior {
@Override
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
- List<String> fields = Lists.newArrayList(
- Build.NAME_LOG,
- Build.NAME_ERROR_MESSAGE);
+ List<String> fields = Lists.newArrayList(Build.NAME_LOG);
JobAware jobAware = getComponent().findParent(JobAware.class);
Job job = jobAware.getJob();
fields.addAll(job.getParamSpecMap().keySet());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 62a916dc78..40ef0bad93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -29,8 +29,10 @@ import org.quartz.ScheduleBuilder;
import org.quartz.SimpleScheduleBuilder;
import org.unbescape.html.HtmlEscape;
+import io.onedev.agent.job.FailedException;
import io.onedev.commons.loader.Listen;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
@@ -145,32 +147,45 @@ public abstract class TaskButton extends AjaxButton {
public TaskResult call() throws Exception {
TaskLogger logger = new TaskLogger() {
+ private final Map<String, StyleBuilder> styleBuilders = new ConcurrentHashMap<>();
+
@Override
public void log(String message, String sessionId) {
synchronized (messages) {
- messages.add(JobLogEntryEx.parse(message, new StyleBuilder()));
+ StyleBuilder styleBuilder;
+ if (sessionId != null) {
+ styleBuilder = styleBuilders.get(sessionId);
+ if (styleBuilder == null) {
+ styleBuilder = new StyleBuilder();
+ styleBuilders.put(sessionId, styleBuilder);
+ }
+ } else {
+ styleBuilder = new StyleBuilder();
+ }
+ messages.add(JobLogEntryEx.parse(message, styleBuilder));
}
}
};
try {
String feedback = String.format(
- "<div class='task-result text-break alert alert-light-info'>%s</div>",
+ "<div class='task-result alert-notice text-break alert alert-light-info'>%s</div>",
runTask(logger));
return new TaskResult(true, feedback);
} catch (Exception e) {
- logger.error("Error " + title, e);
+ if (ExceptionUtils.find(e, FailedException.class) == null) {
+ ExplicitException explicitException = ExceptionUtils.find(e, ExplicitException.class);
+ if (explicitException != null)
+ logger.error(explicitException.getMessage());
+ else
+ logger.error(null, e);
+ }
String suggestedSolution = ExceptionUtils.suggestSolution(e);
if (suggestedSolution != null)
logger.error("!!! " + suggestedSolution);
- String feedback;
- if (e.getMessage() != null)
- feedback = e.getMessage();
- else
- feedback = "Error " + title;
- feedback = String.format(
- "<div class='task-result text-break alert alert-light-danger'>%s</div>",
- HtmlEscape.escapeHtml5(feedback));
+ String feedback = String.format(
+ "<div class='task-result text-break alert-notice alert alert-light-danger'>%s</div>",
+ HtmlEscape.escapeHtml5("Error " + title));
feedback = StringUtils.replace(feedback, "\n", "<br>");
return new TaskResult(false, feedback);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index b6db82e984..110b7ddfd5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -21,7 +21,6 @@
<div class="main flex-grow-1 d-flex flex-column">
<div wicket:id="jobNotFound" class="alert alert-notice alert-light-danger">Job '<span wicket:id="jobName"></span>' associated with the build not found.
Most probably there are import errors in the <a wicket:id="buildSpec">build spec</a></div>
- <pre wicket:id="errorMessage" class="error-message alert alert-notice alert-light-danger overflow-auto mb-4 flex-shrink-0 p-3 text-break"></pre>
<ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>
<wicket:child></wicket:child>
</div>
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 a842de3c5c..df257b0971 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
@@ -375,31 +375,6 @@ public abstract class BuildDetailPage extends ProjectPage
add(jobNotFoundContainer);
- add(new Label("errorMessage", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return getBuild().getErrorMessage();
- }
-
- }) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(newBuildObserver(getBuild().getId()));
- setOutputMarkupPlaceholderTag(true);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getBuild().isFinished() && getBuild().getErrorMessage() != null);
- }
-
- });
-
add(new Tabbable("buildTabs", new LoadableDetachableModel<List<? extends Tab>>() {
@Override
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index aab2fd5a16..c90e0be720 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -44,6 +44,7 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import io.onedev.agent.job.FailedException;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
@@ -700,15 +701,6 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return map;
}
- private String getContainerDisplayName(CompositeExecutable entryExecutable, String containerName) {
- if (containerName.startsWith("step-")) {
- List<Integer> position = KubernetesHelper.parsePosition(containerName.substring("step-".length()));
- return "Step \"" + entryExecutable.getNamesAsString(position) + "\"";
- } else {
- return containerName;
- }
- }
-
private void execute(String jobToken, TaskLogger jobLogger, Object executionContext) {
jobLogger.log("Checking cluster access...");
JobContext jobContext;
@@ -1012,7 +1004,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
jobLogger.log("Starting job containers...");
- List<String> errorMessages = new ArrayList<>();
+ AtomicBoolean failed = new AtomicBoolean(false);
for (String containerName: containerNames) {
logger.debug("Waiting for start of container (pod: {}, container: {})...",
@@ -1030,8 +1022,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
* might contain error details
*/
if (error.isFatal()) {
- return new Abort(getContainerDisplayName(entryExecutable, containerName)
- + ": " + error.getMessage());
+ String errorMessage;
+ if (containerName.startsWith("step-")) {
+ List<Integer> position = KubernetesHelper.parsePosition(containerName.substring("step-".length()));
+ errorMessage = "Step \"" + entryExecutable.getNamesAsString(position)
+ + ": " + error.getMessage();
+ } else {
+ errorMessage = containerName + ": " + error.getMessage();
+ }
+ return new Abort(errorMessage);
} else {
return new Abort(null);
}
@@ -1058,9 +1057,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
public Abort check(String nodeName, Collection<JsonNode> containerStatusNodes) {
ContainerError error = getContainerErrors(containerStatusNodes).get(containerName);
if (error != null) {
- String errorMessage = getContainerDisplayName(entryExecutable, containerName)
- + ": " + error.getMessage();
- errorMessages.add(errorMessage);
+ String errorMessage;
+ if (containerName.startsWith("step-")) {
+ List<Integer> position = KubernetesHelper.parsePosition(containerName.substring("step-".length()));
+ errorMessage = "Step \"" + entryExecutable.getNamesAsString(position)
+ + " is failed: " + error.getMessage();
+ } else {
+ errorMessage = containerName + ": " + error.getMessage();
+ }
+
/*
* We abort the watch with an exception for two reasons:
*
@@ -1069,10 +1074,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
* container will wait indefinitely on the successful/failed mark file in
* this case, causing log following last indefinitely
*/
- if (error.isFatal() || containerName.equals("init"))
+ if (error.isFatal() || containerName.equals("init")) {
return new Abort(errorMessage);
- else
+ } else {
+ jobLogger.error(errorMessage);
+ failed.set(true);
return new Abort(null);
+ }
} else if (getStoppedContainers(containerStatusNodes).contains(containerName)) {
return new Abort(null);
} else {
@@ -1083,8 +1091,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}, jobLogger);
}
- if (!errorMessages.isEmpty())
- throw new ExplicitException(errorMessages.iterator().next());
+ if (failed.get())
+ throw new FailedException();
if (jobContext != null && isCreateCacheLabels())
updateCacheLabels(nodeName, jobContext, jobLogger);
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index da5f07d258..fe79d6f36f 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -41,6 +41,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import io.onedev.agent.DockerExecutorUtils;
+import io.onedev.agent.job.FailedException;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
@@ -221,14 +222,12 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
jobContext.reportJobWorkspace(containerWorkspace);
CompositeExecutable entryExecutable = new CompositeExecutable(jobContext.getActions());
- List<String> errorMessages = new ArrayList<>();
-
- entryExecutable.execute(new LeafHandler() {
+ boolean successful = entryExecutable.execute(new LeafHandler() {
@Override
public boolean execute(LeafExecutable executable, List<Integer> position) {
String stepNames = entryExecutable.getNamesAsString(position);
- jobLogger.log("Running step \"" + stepNames + "\"...");
+ jobLogger.notice("Running step \"" + stepNames + "\"...");
if (executable instanceof CommandExecutable) {
CommandExecutable commandExecutable = (CommandExecutable) executable;
@@ -304,11 +303,9 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
ProcessKiller killer = newDockerKiller(newDocker(), containerName, jobLogger);
ExecutionResult result = docker.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger), null, killer);
if (result.getReturnCode() != 0) {
- errorMessages.add("Step \"" + stepNames + "\": Command failed with exit code " + result.getReturnCode());
+ jobLogger.error("Step \"" + stepNames + "\" is failed: Command failed with exit code " + result.getReturnCode());
return false;
- } else {
- return true;
- }
+ }
} else if (executable instanceof CheckoutExecutable) {
try {
CheckoutExecutable checkoutExecutable = (CheckoutExecutable) executable;
@@ -333,10 +330,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),
cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),
cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
-
- return true;
} catch (Exception e) {
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
}
} else {
@@ -368,26 +363,26 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
entry.getValue());
}
}
-
- return true;
} catch (Exception e) {
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
} finally {
FileUtils.deleteDir(filesDir);
}
}
+ jobLogger.success("Step \"" + stepNames + "\" is successful");
+ return true;
}
@Override
public void skip(LeafExecutable executable, List<Integer> position) {
- jobLogger.log("Skipping step \"" + entryExecutable.getNamesAsString(position) + "\"...");
+ jobLogger.notice("Step \"" + entryExecutable.getNamesAsString(position) + "\" is skipped");
}
}, new ArrayList<>());
- if (!errorMessages.isEmpty())
- throw new ExplicitException(errorMessages.iterator().next());
+ if (!successful)
+ throw new FailedException();
jobLogger.log("Reporting job caches...");
jobManager.reportJobCaches(jobToken, getCacheInstances(hostCacheHome).keySet());
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index 62a424a9a0..70ba6e4d22 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -25,6 +25,8 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang.SystemUtils;
import static io.onedev.agent.ShellExecutorUtils.*;
+
+import io.onedev.agent.job.FailedException;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
@@ -135,14 +137,12 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
CompositeExecutable entryExecutable = new CompositeExecutable(jobContext.getActions());
- List<String> errorMessages = new ArrayList<>();
-
- entryExecutable.execute(new LeafHandler() {
+ boolean successful = entryExecutable.execute(new LeafHandler() {
@Override
public boolean execute(LeafExecutable executable, List<Integer> position) {
String stepNames = entryExecutable.getNamesAsString(position);
- jobLogger.log("Running step \"" + stepNames + "\"...");
+ jobLogger.notice("Running step \"" + stepNames + "\"...");
if (executable instanceof CommandExecutable) {
CommandExecutable commandExecutable = (CommandExecutable) executable;
@@ -191,10 +191,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
ExecutionResult result = shell.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger));
if (result.getReturnCode() != 0) {
- errorMessages.add("Step \"" + stepNames + "\": Command failed with exit code " + result.getReturnCode());
+ jobLogger.error("Step \"" + stepNames + "\" is failed: Command failed with exit code " + result.getReturnCode());
return false;
- } else {
- return true;
}
} else if (executable instanceof CheckoutExecutable) {
try {
@@ -219,10 +217,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),
cloneInfo.getCloneUrl(), jobContext.getCommitId().name(), cloneDepth,
newInfoLogger(jobLogger), newErrorLogger(jobLogger));
-
- return true;
} catch (Exception e) {
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
}
} else {
@@ -254,27 +250,27 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
entry.getValue());
}
}
-
- return true;
} catch (Exception e) {
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
} finally {
FileUtils.deleteDir(filesDir);
}
}
+ jobLogger.success("Step \"" + stepNames + "\" is successful");
+ return true;
}
@Override
public void skip(LeafExecutable executable, List<Integer> position) {
- jobLogger.log("Skipping step \"" + entryExecutable.getNamesAsString(position) + "\"...");
+ jobLogger.notice("Step \"" + entryExecutable.getNamesAsString(position) + "\" is skipped");
}
}, new ArrayList<>());
+
+ if (!successful)
+ throw new FailedException();
- if (!errorMessages.isEmpty())
- throw new ExplicitException(errorMessages.iterator().next());
-
jobLogger.log("Reporting job caches...");
jobManager.reportJobCaches(jobToken, getCacheInstances(cacheHomeDir).keySet());
} finally {