Skip to content

The Unified and Autonomous Development Platform

Improve docker executor and maven detector

Robin Shen8877b11a378f
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index cd78202fa4..477d30e108 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -165,7 +165,6 @@ import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;
import io.onedev.server.entitymanager.impl.DefaultSettingManager;
import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultUserManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitPostReceiveCallback;
import io.onedev.server.git.GitPreReceiveCallback;
diff --git a/core/src/main/java/io/onedev/server/exception/OneException.java b/core/src/main/java/io/onedev/server/OneException.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/exception/OneException.java
rename to core/src/main/java/io/onedev/server/OneException.java
index 116573fc44..c5076af80f 100644
--- a/core/src/main/java/io/onedev/server/exception/OneException.java
+++ b/core/src/main/java/io/onedev/server/OneException.java
@@ -1,4 +1,4 @@
-package io.onedev.server.exception;
+package io.onedev.server;
public class OneException extends RuntimeException {
diff --git a/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java b/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
index 5e50455a11..08e95cad31 100644
--- a/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
+++ b/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
@@ -1,6 +1,6 @@
package io.onedev.server.ci;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
public class InvalidCISpecException extends OneException {
diff --git a/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java
index 563aaf1328..4e4f91451a 100644
--- a/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java
+++ b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java
@@ -27,8 +27,6 @@ public class MavenDetector implements CISpecDetector {
job.setName("ci");
job.setEnvironment("maven:3.6.1-jdk-8");
job.setCommands(Lists.newArrayList(
- "mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version",
- "echo",
"buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",
"echo \"##onedev[SetBuildVersion '$buildVersion']\"",
"echo",
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index c6778defc8..f22451e95d 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -33,6 +33,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.schedule.SchedulableTask;
import io.onedev.commons.utils.schedule.TaskScheduler;
+import io.onedev.server.OneException;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Dependency;
import io.onedev.server.ci.InvalidCISpecException;
@@ -54,7 +55,6 @@ import io.onedev.server.event.build.BuildSubmitted;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
@@ -281,10 +281,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
Logger logger = logManager.getLogger(build.getProject().getId(), build.getId(), job.getLogLevel());
Long buildId = build.getId();
- JobExecution execution = new JobExecution(executorService.submit(new Callable<Void>() {
+ JobExecution execution = new JobExecution(executorService.submit(new Callable<Boolean>() {
@Override
- public Void call() {
+ public Boolean call() {
logger.info("Creating workspace...");
File workspace = FileUtils.createTempDir("workspace");
try {
@@ -320,7 +320,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
logger.info("Executing job with executor '" + executor.getName() + "'...");
- executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(), snapshot,
+ boolean result = executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(), snapshot,
job.getCaches(), new PatternSet(includeFiles, excludeFiles), logger);
sessionManager.run(new Runnable() {
@@ -334,6 +334,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
}
});
+
+ return result;
} catch (Exception e) {
if (ExceptionUtils.find(e, InterruptedException.class) == null)
logger.error("Error running build", e);
@@ -343,7 +345,6 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
FileUtils.deleteDir(workspace);
logger.info("Workspace deleted");
}
- return null;
}
}), job.getTimeout() * 1000L);
@@ -518,8 +519,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
} else if (execution.isDone()) {
it.remove();
try {
- execution.check();
- build.setStatus(Build.Status.SUCCESSFUL);
+ if (execution.get())
+ build.setStatus(Build.Status.SUCCESSFUL);
+ else
+ build.setStatus(Build.Status.FAILED);
} catch (TimeoutException e) {
build.setStatus(Build.Status.TIMED_OUT);
} catch (CancellationException e) {
diff --git a/core/src/main/java/io/onedev/server/ci/job/JobExecution.java b/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
index c7c71b0a1b..f676ea3a1a 100644
--- a/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
+++ b/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
public class JobExecution {
- private final Future<?> future;
+ private final Future<Boolean> future;
private final long beginTime;
@@ -16,7 +16,7 @@ public class JobExecution {
private volatile Long cancellerId;
- public JobExecution(Future<?> future, long timeout) {
+ public JobExecution(Future<Boolean> future, long timeout) {
this.future = future;
beginTime = System.currentTimeMillis();
this.timeout = timeout;
@@ -39,13 +39,13 @@ public class JobExecution {
return future.isDone();
}
- public void check() throws InterruptedException, TimeoutException, ExecutionException {
+ public boolean get() throws InterruptedException, TimeoutException, ExecutionException {
if (isTimedout())
throw new TimeoutException();
else if (cancellerId != null)
throw new CancellerAwareCancellationException(cancellerId);
else
- future.get();
+ return future.get();
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java
index 82a3205ad3..de3ac68c4e 100644
--- a/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java
@@ -4,7 +4,7 @@ import java.io.File;
import org.apache.commons.io.FilenameUtils;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
public class CacheAllocation {
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheCallable.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheCallable.java
new file mode 100644
index 0000000000..4fdd96289c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheCallable.java
@@ -0,0 +1,9 @@
+package io.onedev.server.ci.job.cache;
+
+import java.util.Collection;
+
+public interface CacheCallable<T> {
+
+ T call(Collection<CacheAllocation> allocations);
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java
deleted file mode 100644
index 76f4dc0f38..0000000000
--- a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.onedev.server.ci.job.cache;
-
-import java.util.Collection;
-
-public interface CacheRunnable {
-
- void run(Collection<CacheAllocation> allocations);
-
-}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java
index d5c515cec7..8e04ce3952 100644
--- a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java
@@ -20,7 +20,7 @@ public class CacheRunner {
this.caches = caches;
}
- public void run(CacheRunnable runnable, Logger logger) {
+ public <T> T call(CacheCallable<T> callable, Logger logger) {
Collection<CacheAllocation> allocations = new ArrayList<>();
try {
if (!cacheHome.exists())
@@ -28,7 +28,7 @@ public class CacheRunner {
for (JobCache cache: caches)
allocations.add(cache.allocate(cacheHome));
- runnable.run(allocations);
+ return callable.call(allocations);
} catch (Exception e) {
throw ExceptionUtils.unchecked(e);
} finally {
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java b/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java
index 3883c109a2..b7a332cc25 100644
--- a/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java
@@ -13,7 +13,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.util.validation.annotation.Path;
import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
index 2d19fe96e9..fed7c6bc9b 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
@@ -92,7 +92,23 @@ public class DefaultLogManager implements LogManager {
private static final long serialVersionUID = 1L;
private void log(LogLevel logLevel, String message) {
- if (logLevel.ordinal() <= loggerLevel.ordinal()) {
+ if (message.startsWith("[INFO] ")) {
+ logLevel = LogLevel.INFO;
+ message = message.substring("[INFO] ".length());
+ } else if (message.startsWith("[ERROR] ")) {
+ logLevel = LogLevel.ERROR;
+ message = message.substring("[ERROR] ".length());
+ } else if (message.startsWith("[WARNING] ")) {
+ logLevel = LogLevel.WARN;
+ message = message.substring("[WARNING] ".length());
+ } else if (message.startsWith("[DEBUG] ")) {
+ logLevel = LogLevel.DEBUG;
+ message = message.substring("[DEBUG] ".length());
+ } else if (message.startsWith("[TRACE] ")) {
+ logLevel = LogLevel.TRACE;
+ message = message.substring("[TRACE] ".length());
+ }
+ if (logLevel.ordinal() <= loggerLevel.ordinal()) {
Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();
lock.lock();
try {
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java
index 0392dbc14b..27f378dd34 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java
@@ -12,8 +12,8 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.commons.launcher.loader.ExtensionPoint;
+import io.onedev.server.OneException;
import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build;
@ExtensionPoint
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index c076c71473..544bcd8eee 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -57,6 +57,7 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.PullRequestBuildManager;
@@ -75,7 +76,6 @@ import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
-import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.FileChange;
import io.onedev.server.model.Build;
diff --git a/core/src/main/java/io/onedev/server/git/exception/GitException.java b/core/src/main/java/io/onedev/server/git/exception/GitException.java
index 34f4dda94a..accf923332 100644
--- a/core/src/main/java/io/onedev/server/git/exception/GitException.java
+++ b/core/src/main/java/io/onedev/server/git/exception/GitException.java
@@ -1,6 +1,6 @@
package io.onedev.server.git.exception;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
public class GitException extends OneException {
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index a136108a16..73d28011ff 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -135,7 +135,7 @@ public abstract class JobExecutor implements Serializable {
this.cacheTTL = cacheTTL;
}
- public abstract void execute(String environment, File workspace, Map<String, String> envVars,
+ public abstract boolean execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, @Nullable SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger);
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
index cd0154ed3d..ad46570460 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
@@ -17,7 +17,7 @@ public class KubernetesExecutor extends JobExecutor {
private static final long serialVersionUID = 1L;
@Override
- public void execute(String environment, File workspace, Map<String, String> envVars,
+ public boolean execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger) {
throw new UnsupportedOperationException();
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
index 7acb1359f6..870cee311e 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
@@ -26,11 +26,12 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.commons.utils.command.ProcessKiller;
import io.onedev.commons.utils.concurrent.ConstrainedRunner;
import io.onedev.server.ci.job.cache.CacheAllocation;
-import io.onedev.server.ci.job.cache.CacheRunnable;
+import io.onedev.server.ci.job.cache.CacheCallable;
import io.onedev.server.ci.job.cache.CacheRunner;
import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.model.support.jobexecutor.ServerDockerExecutor.TestData;
@@ -205,17 +206,17 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
@Override
- public void execute(String environment, File workspace, Map<String, String> envVars,
+ public boolean execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger) {
- getConstrainedRunner().run(new Runnable() {
+ return getConstrainedRunner().call(new Callable<Boolean>() {
@Override
- public void run() {
- new CacheRunner(getCacheHome(), caches).run(new CacheRunnable() {
+ public Boolean call() {
+ return new CacheRunner(getCacheHome(), caches).call(new CacheCallable<Boolean>() {
@Override
- public void run(Collection<CacheAllocation> allocations) {
+ public Boolean call(Collection<CacheAllocation> allocations) {
login(logger);
logger.info("Pulling image...") ;
@@ -290,7 +291,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
logger.info("Running container to execute job...");
- cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
+ ExecuteResult result = cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
@Override
public void kill(Process process) {
@@ -300,17 +301,24 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
}
- }).checkReturnCode();
+ });
- if (workspaceCache != null) {
- int baseLen = workspaceCache.getAbsolutePath().length()+1;
- for (File file: collectFiles.listFiles(workspaceCache)) {
- try {
- FileUtils.copyFile(file, new File(workspace, file.getAbsolutePath().substring(baseLen)));
- } catch (IOException e) {
- throw new RuntimeException(e);
+ if (result.getReturnCode() == 125 || result.getReturnCode() == 126 || result.getReturnCode() == 127) {
+ throw result.buildException();
+ } else if (result.getReturnCode() != 0) {
+ if (workspaceCache != null) {
+ int baseLen = workspaceCache.getAbsolutePath().length()+1;
+ for (File file: collectFiles.listFiles(workspaceCache)) {
+ try {
+ FileUtils.copyFile(file, new File(workspace, file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
}
+ return false;
+ } else {
+ return true;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
index 9d295ae111..533c43b733 100644
--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
@@ -16,7 +16,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.StateSpec;
diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
index b9c43fa20d..3041c92a62 100644
--- a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
@@ -26,9 +26,9 @@ import org.slf4j.LoggerFactory;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.event.RefUpdated;
-import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.model.Build;
diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 6450ab9201..612093e674 100644
--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -15,10 +15,10 @@ import com.google.common.base.Splitter;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 51fdafc096..e3679831f6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -25,8 +25,8 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.cache.CacheManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.AndCriteriaHelper;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 07e10316eb..29450e730e 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -21,7 +21,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.AndCriteriaHelper;
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 17cb355034..62f17a37d2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -34,8 +34,8 @@ import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 9dd8113293..1d1bbec43c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -15,8 +15,8 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
diff --git a/core/src/main/java/io/onedev/server/util/GroovyUtils.java b/core/src/main/java/io/onedev/server/util/GroovyUtils.java
index 1a65d13f73..cd20513b95 100644
--- a/core/src/main/java/io/onedev/server/util/GroovyUtils.java
+++ b/core/src/main/java/io/onedev/server/util/GroovyUtils.java
@@ -8,7 +8,6 @@ import com.google.common.collect.MapMaker;
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.Script;
-import io.onedev.server.exception.ScriptException;
public class GroovyUtils {
diff --git a/core/src/main/java/io/onedev/server/exception/ScriptException.java b/core/src/main/java/io/onedev/server/util/ScriptException.java
similarity index 77%
rename from core/src/main/java/io/onedev/server/exception/ScriptException.java
rename to core/src/main/java/io/onedev/server/util/ScriptException.java
index 9c45883678..e12060b8f9 100644
--- a/core/src/main/java/io/onedev/server/exception/ScriptException.java
+++ b/core/src/main/java/io/onedev/server/util/ScriptException.java
@@ -1,4 +1,6 @@
-package io.onedev.server.exception;
+package io.onedev.server.util;
+
+import io.onedev.server.OneException;
public class ScriptException extends OneException {
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java
index 44b58a835b..fa5a9769f1 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java
@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
index 12e1080ea8..1cd9fffd8f 100644
--- a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -20,7 +20,7 @@ import org.unbescape.java.JavaEscape;
import io.onedev.commons.utils.stringmatch.Matcher;
import io.onedev.commons.utils.stringmatch.WildcardPathMatcher;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.util.patternset.PatternSetParser.PatternContext;
import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;
diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index 51dd81816d..fa0ae88314 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -18,9 +18,9 @@ import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.tree.TerminalNode;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Group;
import io.onedev.server.model.User;
import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;
diff --git a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
index 47b391fba3..4a08b178c3 100644
--- a/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
+++ b/core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java
@@ -17,7 +17,7 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.usermatcher.UserMatcherParser.CriteriaContext;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 2df01d43be..061af7f766 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -20,8 +20,8 @@ import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.cache.CacheManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.BuildQueryLexer;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 6d2e39cbff..d490421363 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -18,7 +18,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index f2ce3b3e16..e41c6010bc 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -31,12 +31,12 @@ import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index b6714ee535..b70e03fe95 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -19,8 +19,8 @@ import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index caee8ec03b..efe76b780b 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
@@ -34,7 +34,7 @@ public class BuildStatusIcon extends GenericPanel<Build> {
String title;
if (build.getStatus() == Status.WAITING) {
- cssClass += "fa-wait";
+ cssClass += "fa-pause";
title = "Waiting for completion of dependency builds";
} else if (build.getStatus() == Status.QUEUEING) {
cssClass += "fa-hourglass-1";
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index eea6b0021b..684a7d33fc 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -14,7 +14,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.BeanUtils;
-import io.onedev.server.exception.OneException;
+import io.onedev.server.OneException;
import io.onedev.server.web.editable.annotation.Editable;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 3e01b6cc60..f759f2f946 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -28,9 +28,9 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.floating.AlignPlacement;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 14ec2f7405..0312a52bcf 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -48,10 +48,10 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CommitQuerySettingManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 757c21aae8..dffc061b00 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -30,11 +30,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 47807db8be..ab97314251 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.OneException;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.BoardSpec;