Skip to content

The Unified and Autonomous Development Platform

Remove image and commands from job class

Robin Shenf52bec68e803
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 e22071576d..2c1c138c8c 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
@@ -425,8 +425,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Build build = buildManager.load(buildId);
Build.push(build);
try {
- return new JobContext(projectName, buildNumber, projectGitDir, job.getActions(buildSpec), job.getImage(),
- serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),
+ return new JobContext(projectName, buildNumber, projectGitDir, job.getActions(buildSpec),
+ serverWorkspace, job.isRetrieveSource(), job.getCloneDepth(),
cloneInfo, job.getCpuRequirement(), job.getMemoryRequirement(),
commitId, caches, new PatternSet(includeFiles, excludeFiles),
executor.getCacheTTL(), retried.get(), services, jobLogger) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 989c655323..a505fdecaa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -22,15 +22,12 @@ import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
import javax.ws.rs.core.HttpHeaders;
import org.apache.wicket.Component;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
-import com.google.common.collect.Lists;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.KubernetesHelper;
@@ -54,7 +51,6 @@ import io.onedev.server.util.EditContext;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -83,12 +79,10 @@ public class Job implements NamedElement, Serializable, Validatable {
private String name;
- private List<ParamSpec> paramSpecs = new ArrayList<>();
+ private List<Step> steps;
- private String image;
+ private List<ParamSpec> paramSpecs = new ArrayList<>();
- private List<String> commands;
-
private boolean retrieveSource = true;
private Integer cloneDepth;
@@ -125,6 +119,10 @@ public class Job implements NamedElement, Serializable, Validatable {
private transient Map<String, ParamSpec> paramSpecMap;
+ public Job() {
+ steps.add(new CommandStep());
+ }
+
@Editable(order=100, description="Specify name of the job")
@NotEmpty
@Override
@@ -136,89 +134,13 @@ public class Job implements NamedElement, Serializable, Validatable {
this.name = name;
}
- @Editable(order=110, description="Specify docker image of the job")
- @Interpolative(variableSuggester="suggestVariables")
- @NotEmpty
- public String getImage() {
- return image;
- }
-
- public void setImage(String image) {
- this.image = image;
- }
-
- @Editable(order=120, name="Commands", description="Specify content of Linux shell script or Windows command batch to execute "
- + "in above image under the repository root")
- @Interpolative
- @Code(language = Code.SHELL, variableProvider="getVariables")
- @Size(min=1, message="may not be empty")
- public List<String> getCommands() {
- return commands;
- }
-
- public void setCommands(List<String> commands) {
- this.commands = commands;
- }
-
public List<Step> getSteps() {
- List<Step> steps = new ArrayList<>();
-
- CommandStep step = new CommandStep();
- step.setImage("mcr.microsoft.com/windows/nanoserver:1809");
- step.setCommands(Lists.newArrayList("dir", "echo 1 > file1"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("mcr.microsoft.com/windows/servercore:1809");
- step.setCommands(Lists.newArrayList("dir", "echo 2 > file2"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("mcr.microsoft.com/windows/nanoserver:1809");
- step.setCommands(Lists.newArrayList("dir", "echo 3 > file3"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("mcr.microsoft.com/windows/servercore:1809");
- step.setCommands(Lists.newArrayList("dir", "echo 4 > file4"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("mcr.microsoft.com/windows/nanoserver2:1809");
- step.setCommands(Lists.newArrayList("dir", "echo 5 > file5"));
- steps.add(step);
-
- /*
- CommandStep step = new CommandStep();
- step.setImage("alpine");
- step.setCommands(Lists.newArrayList("set -e", "ls", "echo 1 > file1"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("alpine");
- step.setAlwaysExecute(true);
- step.setCommands(Lists.newArrayList("set -e", "ls", "echo 2 > file2"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("alpine");
- step.setCommands(Lists.newArrayList("set -e", "ls", "echo 3 > file3"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("alpine");
- step.setCommands(Lists.newArrayList("set -e", "ls", "echo 4 > file4"));
- steps.add(step);
-
- step = new CommandStep();
- step.setImage("alpine");
- step.setAlwaysExecute(true);
- step.setCommands(Lists.newArrayList("set -e", "ls", "echo 5 > file5"));
- steps.add(step);
- */
-
return steps;
}
+
+ public void setSteps(List<Step> steps) {
+ this.steps = steps;
+ }
public List<Action> getActions(BuildSpec buildSpec) {
List<Action> actions = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
index 8c3a457d26..4f21d68b72 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
@@ -22,14 +22,10 @@ public abstract class JobContext {
private final File projectGitDir;
- private final String image;
-
private final File serverWorkspace;
private final List<Action> actions;
- private final List<String> commands;
-
private final boolean retrieveSource;
private final Integer cloneDepth;
@@ -59,7 +55,7 @@ public abstract class JobContext {
private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();
public JobContext(String projectName, Long buildNumber,
- File projectGitDir, List<Action> actions, String image, File workspace, List<String> commands,
+ File projectGitDir, List<Action> actions, File workspace,
boolean retrieveSource, Integer cloneDepth, CloneInfo cloneInfo,
String cpuRequirement, String memoryRequirement, ObjectId commitId,
Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,
@@ -68,9 +64,7 @@ public abstract class JobContext {
this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
this.actions = actions;
- this.image = image;
this.serverWorkspace = workspace;
- this.commands = commands;
this.retrieveSource = retrieveSource;
this.cloneDepth = cloneDepth;
this.cloneInfo = cloneInfo;
@@ -101,18 +95,10 @@ public abstract class JobContext {
return actions;
}
- public String getImage() {
- return image;
- }
-
public File getServerWorkspace() {
return serverWorkspace;
}
- public List<String> getCommands() {
- return commands;
- }
-
public ObjectId getCommitId() {
return commitId;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
index 9395ebc4d1..62b3b9d749 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -5,7 +5,9 @@ import java.util.List;
import javax.validation.constraints.Size;
+import org.apache.wicket.Component;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -31,7 +33,7 @@ public class CommandStep extends Step {
private String image;
- private List<String> commands;
+ private List<String> commands = new ArrayList<>();
@Editable(order=100, description="Specify docker image to execute commands inside")
@Interpolative(variableSuggester="suggestVariables")
@@ -57,6 +59,32 @@ public class CommandStep extends Step {
this.commands = commands;
}
+ public static List<InputSuggestion> suggestVariables(String matchWith) {
+ Component component = ComponentContext.get().getComponent();
+ List<InputSuggestion> suggestions = new ArrayList<>();
+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
+ BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);
+ if (buildSpecAware != null) {
+ BuildSpec buildSpec = buildSpecAware.getBuildSpec();
+ if (buildSpec != null) {
+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
+ if (jobAware != null) {
+ Job job = jobAware.getJob();
+ if (job != null) {
+ RevCommit commit;
+ if (page.getBlobIdent().revision != null)
+ commit = page.getCommit();
+ else
+ commit = null;
+ suggestions.addAll(SuggestionUtils.suggestVariables(
+ page.getProject(), commit, buildSpec, job, matchWith));
+ }
+ }
+ }
+ }
+ return suggestions;
+ }
+
@SuppressWarnings("unused")
private static List<String> getVariables() {
List<String> variables = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java
deleted file mode 100644
index c77695bfa8..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.onedev.server.util.jobmatch;
-
-import static io.onedev.server.model.Build.NAME_IMAGE;
-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
-import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
-
-public class ImageCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private String image;
-
- public ImageCriteria(String image) {
- this.image = image;
- }
-
- @Override
- public boolean matches(Build build) {
- return WildcardUtils.matchString(image, build.getJob().getImage());
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(NAME_IMAGE) + " " + getRuleName(Is) + " " + quote(image);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
index 6750deba95..5a364254b3 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
@@ -87,7 +87,7 @@ public class JobMatch extends Criteria<Build> {
case Build.NAME_JOB:
return new NameCriteria(fieldValue);
default:
- return new ImageCriteria(fieldValue);
+ throw new RuntimeException("Unknown job match field: " + fieldName);
}
}
diff --git a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
index 381fc52052..10fd4f1d2a 100644
--- a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
@@ -17,6 +17,7 @@ import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
import io.onedev.server.buildspec.job.trigger.PullRequestUpdateTrigger;
+import io.onedev.server.buildspec.step.CommandStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -39,13 +40,18 @@ public class GradleJobSuggestion implements JobSuggestion {
if (gradleBlob != null || kotlinGradleBlob != null) {
Job job = new Job();
job.setName("gradle ci");
- job.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
- job.setCommands(Lists.newArrayList(
+
+ CommandStep step = new CommandStep();
+
+ step.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
+ step.setCommands(Lists.newArrayList(
"set -e",
"echo \"Detecting project version (may require some time while downloading gradle dependencies)...\"",
"buildVersion=$(gradle properties | grep ^version: | grep -v unspecified | cut -c10-)",
"echo \"##onedev[SetBuildVersion '$buildVersion']\"",
"gradle build"));
+
+ job.getSteps().add(step);
setupTriggers(job);
setupCaches(job);
jobs.add(job);
diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
index a969630d17..76308e5e69 100644
--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
@@ -22,6 +22,7 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
+import io.onedev.server.buildspec.step.CommandStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -43,18 +44,22 @@ public class MavenJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("maven ci");
- job.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
+ CommandStep step = new CommandStep();
+
+ step.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
/*
* Before running maven test, we extract version of the project and use LogInstruction to tell
* OneDev using extracted version for current build
*/
- job.setCommands(Lists.newArrayList(
+ step.setCommands(Lists.newArrayList(
"echo \"Detecting project version (may require some time while downloading maven dependencies)...\"",
"buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",
"echo \"##onedev[SetBuildVersion '$buildVersion']\"",
"echo",
"mvn clean test"));
+ job.getSteps().add(step);
+
// Trigger the job automatically when there is a push to the branch
BranchUpdateTrigger trigger = new BranchUpdateTrigger();
job.getTriggers().add(trigger);
diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
index b962d832a5..8b97a1c028 100644
--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
@@ -23,6 +23,7 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
+import io.onedev.server.buildspec.step.CommandStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -56,7 +57,9 @@ public class NodeJobSuggestion implements JobSuggestion {
if (content.indexOf("angular/core") != -1) { // Recognize angular projects
Job job = new Job();
job.setName("angular ci");
- job.setImage("1dev/buildspec-node:10.16-alpine-chrome");
+
+ CommandStep step = new CommandStep();
+ step.setImage("1dev/buildspec-node:10.16-alpine-chrome");
List<String> commands = Lists.newArrayList(
"echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
"echo",
@@ -99,7 +102,9 @@ public class NodeJobSuggestion implements JobSuggestion {
"npx ng build"));
}
- job.setCommands(commands);
+ step.setCommands(commands);
+ job.getSteps().add(step);
+
setupTriggers(job);
setupCaches(job);
jobs.add(job);
@@ -108,7 +113,9 @@ public class NodeJobSuggestion implements JobSuggestion {
if (content.indexOf("react") != -1) { // Recognize react projects
Job job = new Job();
job.setName("react ci");
- job.setImage("node:10.16-alpine");
+
+ CommandStep step = new CommandStep();
+ step.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
"echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
@@ -148,7 +155,10 @@ public class NodeJobSuggestion implements JobSuggestion {
"npx react-scripts build"));
}
- job.setCommands(commands);
+ step.setCommands(commands);
+
+ job.getSteps().add(step);
+
setupTriggers(job);
setupCaches(job);
jobs.add(job);
@@ -157,7 +167,10 @@ public class NodeJobSuggestion implements JobSuggestion {
if (content.indexOf("vue") != -1) { // Recognize vue projects
Job job = new Job();
job.setName("vue ci");
- job.setImage("node:10.16-alpine");
+
+ CommandStep step = new CommandStep();
+
+ step.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
"echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
@@ -191,7 +204,9 @@ public class NodeJobSuggestion implements JobSuggestion {
commands.add("npx jest");
}
- job.setCommands(commands);
+ step.setCommands(commands);
+ job.getSteps().add(step);
+
setupTriggers(job);
setupCaches(job);
jobs.add(job);
@@ -200,7 +215,10 @@ public class NodeJobSuggestion implements JobSuggestion {
if (content.indexOf("express") != -1) { // Recognize express projects
Job job = new Job();
job.setName("express ci");
- job.setImage("node:10.16-alpine");
+
+ CommandStep step = new CommandStep();
+
+ step.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
"echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
@@ -232,7 +250,9 @@ public class NodeJobSuggestion implements JobSuggestion {
} else {
commands.add("npx mocha");
}
- job.setCommands(commands);
+ step.setCommands(commands);
+
+ job.getSteps().add(step);
setupTriggers(job);
setupCaches(job);
jobs.add(job);
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
index 59871703de..3b73cc12e7 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
@@ -582,13 +582,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\onedev\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};
else
containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};
-
- File scriptFile = new File(hostBuildHome, "job-commands.bat");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\r\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
} else {
containerBuildHome = "/onedev-build";
containerWorkspace = "/onedev-build/workspace";
@@ -597,13 +590,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
containerCommand = new String[] {"-c", "cp -r -f -p /root/onedev/. /root && sh /onedev-build/job-commands.sh"};
else
containerCommand = new String[] {"/onedev-build/job-commands.sh"};
-
- File scriptFile = new File(hostBuildHome, "job-commands.sh");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
}
jobContext.reportJobWorkspace(containerWorkspace);
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 27ba98d598..7673c0dda1 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
@@ -1244,6 +1244,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
StringBuilder json = new StringBuilder();
kubectl.addArgs("get", "pod", podName, "-n", namespace, "--watch", "-o", "json");
+
kubectl.timeout(POD_WATCH_TIMEOUT);
Thread thread = Thread.currentThread();
@@ -1319,7 +1320,9 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
throw new ExplicitException(abort.getErrorMessage());
else
break;
- } else if (ExceptionUtils.find(e, TimeoutException.class) == null){
+ } else if (ExceptionUtils.find(e, TimeoutException.class) == null) {
+ // If there is no output for some time, let's re-watch as sometimes
+ // pod status update is not pushed
throw ExceptionUtils.unchecked(e);
}
}
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index 24cefd9ea3..e2a1fb407e 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -63,7 +63,6 @@ public class KubernetesResource {
if (StringUtils.isNotBlank(jobWorkspace))
context.reportJobWorkspace(jobWorkspace);
Map<String, Object> contextMap = new HashMap<>();
- contextMap.put("commands", context.getCommands());
contextMap.put("actions", context.getActions());
contextMap.put("retrieveSource", context.isRetrieveSource());
contextMap.put("cloneDepth", context.getCloneDepth());