The Unified and Autonomous Development Platform
midwork
Robin Shen863607360b4b
diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.javaindex 36a359458d..af1a8318db 100644--- a/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java@@ -1,6 +1,5 @@package io.onedev.server.model.support;-import java.io.File;import java.io.Serializable;import org.eclipse.jgit.lib.ObjectId;@@ -108,10 +107,6 @@ public abstract class JobExecutor implements Serializable {this.cacheTTL = cacheTTL;}- protected File getCacheHome() {- return new File(System.getProperty("user.home"), "onedev-cache");- }-public abstract void execute(String jobToken, JobContext context);public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String environment) {diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.javaindex f982fd481f..94b199a434 100644--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java@@ -19,7 +19,6 @@ import org.apache.commons.codec.Charsets;import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import org.unbescape.json.JsonEscape;import org.yaml.snakeyaml.Yaml;import com.fasterxml.jackson.databind.JsonNode;@@ -403,6 +402,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatareturn secretEnvs;}+ private String getCacheHome(String osName) {+ if (osName.equalsIgnoreCase("linux"))+ return "/var/cache/onedev-ci";+ else+ return "C:\\ProgramData\\onedev-ci\\cache";+ }+private void execute(String dockerImage, String jobToken, JobLogger logger, @Nullable JobContext jobContext) {createNamespaceIfNotExist(logger);@@ -498,7 +504,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataMap<Object, Object> cacheHomeVolume = Maps.newLinkedHashMap("name", "cache-home","hostPath", Maps.newLinkedHashMap(- "path", JsonEscape.escapeJson(getCacheHome().getAbsolutePath()),+ "path", getCacheHome(osName),"type", "DirectoryOrCreate"));podSpec.put("volumes", Lists.<Object>newArrayList(ciHomeVolume, cacheHomeVolume));diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.javaindex 2444e38849..0f5c4a4008 100644--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java@@ -157,6 +157,10 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDareturn capacityRunner;}+ private File getCacheHome() {+ return new File(System.getProperty("user.home"), "onedev-cache");+ }+@Overridepublic void execute(String jobToken, JobContext jobContext) {File hostCIHome = FileUtils.createTempDir("onedev-ci");