Skip to content

The Unified and Autonomous Development Platform

Step support for Kubernetes and Docker executor

Robin Shen232cc2ca8e47
diff --git a/pom.xml b/pom.xml
index d3d768521b..c640d28e14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,8 +573,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.5</commons.version>
- <k8shelper.version>1.0.28</k8shelper.version>
+ <commons.version>2.0.6</commons.version>
+ <k8shelper.version>2.0.0</k8shelper.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 10325292b3..e1dc12a937 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -17,6 +17,8 @@ import javax.validation.Valid;
import javax.validation.ValidationException;
import org.apache.commons.lang3.SerializationUtils;
+import org.apache.wicket.Component;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
@@ -30,19 +32,26 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Lists;
+import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.buildspec.job.retrycondition.RetryCondition;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
+import io.onedev.server.buildspec.step.StepTemplate;
import io.onedev.server.migration.VersionedYamlDoc;
import io.onedev.server.migration.XmlBuildSpecMigrator;
+import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.server.web.util.WicketUtils;
@Editable
@ClassValidating
@@ -72,10 +81,16 @@ public class BuildSpec implements Serializable, Validatable {
private List<Job> jobs = new ArrayList<>();
+ private List<StepTemplate> stepTemplates = new ArrayList<>();
+
private List<Property> properties = new ArrayList<>();
+ private List<BuildSpecImport> imports = new ArrayList<>();
+
private transient Map<String, Job> jobMap;
+ private transient Map<String, StepTemplate> stepTemplateMap;
+
private transient Map<String, String> propertyMap;
@Editable
@@ -88,6 +103,16 @@ public class BuildSpec implements Serializable, Validatable {
this.jobs = jobs;
}
+ @Editable
+ @Valid
+ public List<StepTemplate> getStepTemplates() {
+ return stepTemplates;
+ }
+
+ public void setStepTemplates(List<StepTemplate> stepTemplates) {
+ this.stepTemplates = stepTemplates;
+ }
+
@Editable
public List<Property> getProperties() {
return properties;
@@ -97,6 +122,16 @@ public class BuildSpec implements Serializable, Validatable {
this.properties = properties;
}
+ @Editable
+ @Valid
+ public List<BuildSpecImport> getImports() {
+ return imports;
+ }
+
+ public void setImports(List<BuildSpecImport> imports) {
+ this.imports = imports;
+ }
+
public Map<String, Job> getJobMap() {
if (jobMap == null) {
jobMap = new LinkedHashMap<>();
@@ -115,6 +150,15 @@ public class BuildSpec implements Serializable, Validatable {
return propertyMap;
}
+ public Map<String, StepTemplate> getStepTemplateMap() {
+ if (stepTemplateMap == null) {
+ stepTemplateMap = new LinkedHashMap<>();
+ for (StepTemplate template: stepTemplates)
+ stepTemplateMap.put(template.getName(), template);
+ }
+ return stepTemplateMap;
+ }
+
@Override
public boolean isValid(ConstraintValidatorContext context) {
boolean valid = true;
@@ -136,7 +180,7 @@ public class BuildSpec implements Serializable, Validatable {
Job dependencyJob = getJobMap().get(dependency.getJobName());
if (dependencyJob != null) {
try {
- ParamSupply.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());
+ ParamSupply.validateParams(null, dependencyJob.getParamSpecs(), dependency.getJobParams());
} catch (ValidationException e) {
String message = "Item #" + j + ": Error validating parameters of dependency job '"
+ dependencyJob.getName() + "': " + e.getMessage();
@@ -167,7 +211,7 @@ public class BuildSpec implements Serializable, Validatable {
j=1;
for (JobTrigger trigger: job.getTriggers()) {
try {
- ParamSupply.validateParams(job.getParamSpecs(), trigger.getParams());
+ ParamSupply.validateParams(null, job.getParamSpecs(), trigger.getParams());
} catch (Exception e) {
String message = "Item #" + j + ": Error validating job parameters: " + e.getMessage();
context.buildConstraintViolationWithTemplate(message)
@@ -234,6 +278,32 @@ public class BuildSpec implements Serializable, Validatable {
}
}
+ 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;
+ }
+
@Nullable
public static BuildSpec parse(byte[] bytes) {
String buildSpecString = new String(bytes, StandardCharsets.UTF_8);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.java
new file mode 100644
index 0000000000..869dcd3ab8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.java
@@ -0,0 +1,120 @@
+package io.onedev.server.buildspec;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Interpolative;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable
+public class BuildSpecImport implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String projectName;
+
+ private String tag;
+
+ private String accessTokenSecret;
+
+ // change Named("projectName") also if change name of this property
+ @Editable(order=100, name="Project", description="Specify project to import build spec from")
+ @ChoiceProvider("getProjectChoices")
+ @NotEmpty
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getProjectChoices() {
+ List<String> choices = new ArrayList<>();
+ Project project = ((ProjectPage)WicketUtils.getPage()).getProject();
+ for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {
+ if (!each.equals(project))
+ choices.add(each.getName());
+ }
+
+ Collections.sort(choices);
+
+ return choices;
+ }
+
+ @Nullable
+ private static Project getInputProject() {
+ String projectName = (String) EditContext.get().getInputValue("projectName");
+ if (projectName != null) {
+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);
+ if (project != null && SecurityUtils.canReadCode(project))
+ return project;
+ }
+ return null;
+ }
+
+ @Editable(order=200, description="Specify tag in above project to import build spec from")
+ @Interpolative(variableSuggester="suggestTags", literalSuggester="suggestTags")
+ @NotEmpty
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestTags(String matchWith) {
+ Project project = getInputProject();
+ if (project != null)
+ return SuggestionUtils.suggestTags(project, matchWith);
+ else
+ return new ArrayList<>();
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith);
+ }
+
+ @Editable(order=500, description="Specify a secret to be used as access token to import build spec "
+ + "from specified project. Leave empty if the project code can be read anonymously")
+ @ChoiceProvider("getAccessTokenSecretChoices")
+ @Nullable
+ @NameOfEmptyValue("Access Anonymously")
+ public String getAccessTokenSecret() {
+ return accessTokenSecret;
+ }
+
+ public void setAccessTokenSecret(String accessTokenSecret) {
+ this.accessTokenSecret = accessTokenSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getAccessTokenSecretChoices() {
+ return Project.get().getBuildSetting().getJobSecrets()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java
new file mode 100644
index 0000000000..2fedf5662c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java
@@ -0,0 +1,12 @@
+package io.onedev.server.buildspec;
+
+import java.io.Serializable;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public interface NamedElement extends Serializable {
+
+ String getName();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java
index d76fefe3ad..6205a7ada2 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.util.validation.annotation.Path;
import io.onedev.server.util.validation.annotation.RegEx;
import io.onedev.server.web.editable.annotation.Editable;
@@ -47,7 +48,7 @@ public class CacheSpec implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
}
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 856e9df8e1..e22071576d 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
@@ -212,7 +212,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private Build submit(Project project, ObjectId commitId, String jobName,
Map<String, List<String>> paramMap, SubmitReason reason, Set<String> checkedJobNames) {
-
+
ScriptIdentity.push(new JobIdentity(project, commitId));
try {
Build build = new Build();
@@ -264,27 +264,22 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
- Build.push(build);
- try {
- for (JobDependency dependency: build.getJob().getJobDependencies()) {
- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(dependency.getJobParams(), build)) {
-
- @Override
- public void run(Map<String, List<String>> params) {
- Build dependencyBuild = submit(project, commitId, dependency.getJobName(),
- params, reason, new LinkedHashSet<>(checkedJobNames));
- BuildDependence dependence = new BuildDependence();
- dependence.setDependency(dependencyBuild);
- dependence.setDependent(build);
- dependence.setRequireSuccessful(dependency.isRequireSuccessful());
- dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));
- build.getDependencies().add(dependence);
- }
-
- }.run();
- }
- } finally {
- Build.pop();
+ for (JobDependency dependency: build.getJob().getJobDependencies()) {
+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(build, dependency.getJobParams())) {
+
+ @Override
+ public void run(Map<String, List<String>> params) {
+ Build dependencyBuild = submit(project, commitId, dependency.getJobName(),
+ params, reason, new LinkedHashSet<>(checkedJobNames));
+ BuildDependence dependence = new BuildDependence();
+ dependence.setDependency(dependencyBuild);
+ dependence.setDependent(build);
+ dependence.setRequireSuccessful(dependency.isRequireSuccessful());
+ dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));
+ build.getDependencies().add(dependence);
+ }
+
+ }.run();
}
for (ProjectDependency dependency: build.getJob().getProjectDependencies()) {
@@ -354,6 +349,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
String jobToken = UUID.randomUUID().toString();
Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
+ BuildSpec buildSpec = build.getProject().getBuildSpec(build.getCommitId());
Job job = (Job) VariableInterpolator.installInterceptor(build.getJob());
JobExecutor executor = getJobExecutor(build);
@@ -429,7 +425,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Build build = buildManager.load(buildId);
Build.push(build);
try {
- return new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),
+ return new JobContext(projectName, buildNumber, projectGitDir, job.getActions(buildSpec), job.getImage(),
serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),
cloneInfo, job.getCpuRequirement(), job.getMemoryRequirement(),
commitId, caches, new PatternSet(includeFiles, excludeFiles),
@@ -635,7 +631,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
JobTriggerMatch match = job.getTriggerMatch(event);
if (match != null) {
Map<String, List<List<String>>> paramMatrix =
- ParamSupply.getParamMatrix(match.getTrigger().getParams(), null);
+ ParamSupply.getParamMatrix(null, match.getTrigger().getParams());
Long projectId = event.getProject().getId();
// run asynchrously as session may get closed due to exception
@@ -894,7 +890,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ThreadContext.bind(userManager.getSystem().asSubject());
Project project = projectManager.load(projectId);
- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(trigger.getParams(), null)) {
+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(null, trigger.getParams())) {
@Override
public void run(Map<String, List<String>> paramMap) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java
index 5a8a52feba..e9498667ed 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.util.validation.annotation.VariableName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -44,7 +45,7 @@ public class EnvVar implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
}
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 8b7c564cff..989c655323 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
@@ -27,19 +27,24 @@ import javax.ws.rs.core.HttpHeaders;
import org.apache.wicket.Component;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
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;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.NamedElement;
import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.buildspec.job.gitcredential.DefaultCredential;
import io.onedev.server.buildspec.job.gitcredential.GitCredential;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
+import io.onedev.server.buildspec.step.CommandStep;
+import io.onedev.server.buildspec.step.Step;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
@@ -62,7 +67,7 @@ import io.onedev.server.web.util.WicketUtils;
@Editable
@ClassValidating
-public class Job implements Serializable, Validatable {
+public class Job implements NamedElement, Serializable, Validatable {
private static final long serialVersionUID = 1L;
@@ -122,6 +127,7 @@ public class Job implements Serializable, Validatable {
@Editable(order=100, description="Specify name of the job")
@NotEmpty
+ @Override
public String getName() {
return name;
}
@@ -141,32 +147,6 @@ public class Job implements Serializable, Validatable {
this.image = image;
}
- 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;
- }
-
@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
@@ -180,6 +160,73 @@ public class Job implements Serializable, Validatable {
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 List<Action> getActions(BuildSpec buildSpec) {
+ List<Action> actions = new ArrayList<>();
+ for (Step step: getSteps())
+ actions.add(step.getAction(buildSpec));
+ return actions;
+ }
+
@SuppressWarnings("unused")
private static List<String> getVariables() {
List<String> variables = 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 a106302897..8c3a457d26 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
@@ -9,6 +9,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.CloneInfo;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
@@ -25,6 +26,8 @@ public abstract class JobContext {
private final File serverWorkspace;
+ private final List<Action> actions;
+
private final List<String> commands;
private final boolean retrieveSource;
@@ -56,7 +59,7 @@ public abstract class JobContext {
private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();
public JobContext(String projectName, Long buildNumber,
- File projectGitDir, String image, File workspace, List<String> commands,
+ File projectGitDir, List<Action> actions, String image, File workspace, List<String> commands,
boolean retrieveSource, Integer cloneDepth, CloneInfo cloneInfo,
String cpuRequirement, String memoryRequirement, ObjectId commitId,
Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,
@@ -64,6 +67,7 @@ public abstract class JobContext {
this.projectName = projectName;
this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
+ this.actions = actions;
this.image = image;
this.serverWorkspace = workspace;
this.commands = commands;
@@ -80,7 +84,7 @@ public abstract class JobContext {
this.services = services;
this.logger = logger;
}
-
+
public String getProjectName() {
return projectName;
}
@@ -93,6 +97,10 @@ public abstract class JobContext {
return projectGitDir;
}
+ public List<Action> getActions() {
+ return actions;
+ }
+
public String getImage() {
return image;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
index 99a03dec5d..2895aacd31 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
@@ -83,7 +83,7 @@ public class JobDependency implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@SuppressWarnings("unused")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
index de74b28e4c..35d12743d9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
@@ -51,7 +52,7 @@ public abstract class JobReport implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
public PatternSet getPatternSet() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java
index 60ac72f46b..10db2edd1f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.util.validation.annotation.DnsName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -112,7 +113,7 @@ public class JobService implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
index 4cc4dc0713..7fce24474e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
@@ -12,6 +12,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
@@ -114,7 +115,7 @@ public class ProjectDependency implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@SuppressWarnings("unused")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java
index a6d04492fc..74e5767103 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java
@@ -7,7 +7,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Milestone;
@@ -36,7 +36,7 @@ public class CloseMilestoneAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
index 91f9546392..8d533657e9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
@@ -64,7 +64,7 @@ public class CreateIssueAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Editable(order=1100, group="Issue Detail")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java
index d186c6de3b..246df583a6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java
@@ -9,7 +9,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
@@ -51,7 +51,7 @@ public class CreateTagAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
index b190c4c43c..095c17777d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
@@ -86,7 +86,7 @@ public class RunJobAction extends PostBuildAction {
@Override
public void execute(Build build) {
- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(getJobParams(), build)) {
+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(build, getJobParams())) {
@Override
public void run(Map<String, List<String>> paramMap) {
@@ -128,7 +128,7 @@ public class RunJobAction extends PostBuildAction {
Job jobToRun = buildSpec.getJobMap().get(jobName);
if (jobToRun != null) {
try {
- ParamSupply.validateParams(jobToRun.getParamSpecs(), jobParams);
+ ParamSupply.validateParams(null, jobToRun.getParamSpecs(), jobParams);
} catch (ValidationException e) {
throw new ValidationException("Error validating parameters of run job '"
+ jobToRun.getName() + "': " + e.getMessage());
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java
index dbff87e7d9..77252e5b2c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java
@@ -5,6 +5,7 @@ import java.util.List;
import org.apache.commons.lang3.builder.HashCodeBuilder;
+import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(name="Ignore")
@@ -26,7 +27,7 @@ public class Ignore implements ValuesProvider {
}
@Override
- public List<List<String>> getValues() {
+ public List<List<String>> getValues(Build build, String paramName) {
List<List<String>> values = new ArrayList<>();
values.add(new ArrayList<>());
return values;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java
index 2d96839925..1441a5183d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java
@@ -49,7 +49,9 @@ public class ParamSupply implements Serializable {
private boolean secret;
private ValuesProvider valuesProvider = new SpecifiedValues();
-
+
+ private static ThreadLocal<String> paramName = new ThreadLocal<String>();
+
@Editable
@NotEmpty
public String getName() {
@@ -173,12 +175,12 @@ public class ParamSupply implements Serializable {
return paramSpecMap;
}
- public static void validateParams(List<ParamSpec> paramSpecs, List<ParamSupply> params) {
+ public static void validateParams(Build build, List<ParamSpec> paramSpecs, List<ParamSupply> params) {
Map<String, List<List<String>>> paramMap = new HashMap<>();
for (ParamSupply param: params) {
List<List<String>> values;
if (param.getValuesProvider() instanceof SpecifiedValues)
- values = param.getValuesProvider().getValues();
+ values = param.getValuesProvider().getValues(build, param.getName());
else
values = null;
if (paramMap.put(param.getName(), values) != null)
@@ -247,29 +249,38 @@ public class ParamSupply implements Serializable {
return paramMap;
}
- public static Map<String, List<List<String>>> getParamMatrix(List<ParamSupply> params, @Nullable Build build) {
+ public static Map<String, List<List<String>>> getParamMatrix(@Nullable Build build, List<ParamSupply> params) {
Map<String, List<List<String>>> paramMatrix = new LinkedHashMap<>();
for (ParamSupply param: params) {
- /*
- * Resolve secret value with current build context as otherwise we may not be authorized to
- * access the secret value. This is possible for instance if a pull request triggers a job,
- * and then post-action of the job triggers another job with a parameter taking value of
- * a secret accessible by the pull request
- */
- if (param.isSecret() && build != null) {
- List<List<String>> resolvedValues = new ArrayList<>();
- for (List<String> value: param.getValuesProvider().getValues()) {
- List<String> resolvedValue = new ArrayList<>();
- for (String each: value)
- resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getSecretValue(each));
- resolvedValues.add(resolvedValue);
+ paramName.set(param.getName());
+ try {
+ /*
+ * Resolve secret value with current build context as otherwise we may not be authorized to
+ * access the secret value. This is possible for instance if a pull request triggers a job,
+ * and then post-action of the job triggers another job with a parameter taking value of
+ * a secret accessible by the pull request
+ */
+ if (param.isSecret() && build != null) {
+ List<List<String>> resolvedValues = new ArrayList<>();
+ for (List<String> value: param.getValuesProvider().getValues(build, param.getName())) {
+ List<String> resolvedValue = new ArrayList<>();
+ for (String each: value)
+ resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getSecretValue(each));
+ resolvedValues.add(resolvedValue);
+ }
+ paramMatrix.put(param.getName(), resolvedValues);
+ } else {
+ paramMatrix.put(param.getName(), param.getValuesProvider().getValues(build, param.getName()));
}
- paramMatrix.put(param.getName(), resolvedValues);
- } else {
- paramMatrix.put(param.getName(), param.getValuesProvider().getValues());
+ } finally {
+ paramName.set(null);
}
}
return paramMatrix;
}
+ public static String getParamName() {
+ return paramName.get();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.java
new file mode 100644
index 0000000000..9367d1d419
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.java
@@ -0,0 +1,54 @@
+package io.onedev.server.buildspec.job.paramsupply;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.Build;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(name="Use specified values or job secrets")
+public class PassthroughValues implements ValuesProvider {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String DISPLAY_NAME = "Use same parameter as current build";
+
+ public static final String SECRET_DISPLAY_NAME = "Use same secret as current build";
+
+ @Override
+ public List<List<String>> getValues(Build build, String paramName) {
+ if (build != null) {
+ List<String> paramValue = build.getParamMap().get(paramName);
+ if (paramValue != null) {
+ List<List<String>> values = new ArrayList<>();
+ values.add(paramValue);
+ return values;
+ } else {
+ String message = String.format("Param not found (build: %s, param: %s)", build.getFQN(), paramName);
+ throw new ExplicitException(message);
+ }
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof PassthroughValues))
+ return false;
+ if (this == other)
+ return true;
+ else
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder(17, 37)
+ .toHashCode();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java
index 8952c1d55a..231035400d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java
@@ -58,9 +58,9 @@ public class ScriptingValues implements ValuesProvider {
@SuppressWarnings("unchecked")
@Override
- public List<List<String>> getValues() {
+ public List<List<String>> getValues(Build build, String paramName) {
Map<String, Object> variables = new HashMap<>();
- variables.put("build", Build.get());
+ variables.put("build", build);
List<List<String>> values = new ArrayList<>();
Object result = GroovyUtils.evalScriptByName(scriptName, variables);
if (result instanceof List) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java
index 808ca93964..8e05dcfd2b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
+import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(name="Use specified values or job secrets")
@@ -20,15 +21,19 @@ public class SpecifiedValues implements ValuesProvider {
private List<List<String>> values = new ArrayList<>();
@Editable
- @Override
public List<List<String>> getValues() {
return values;
}
-
+
public void setValues(List<List<String>> values) {
this.values = values;
}
+ @Override
+ public List<List<String>> getValues(Build build, String paramName) {
+ return getValues();
+ }
+
@Override
public boolean equals(Object other) {
if (!(other instanceof SpecifiedValues))
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java
index 40f6fa7a15..e608c22145 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java
@@ -3,11 +3,14 @@ package io.onedev.server.buildspec.job.paramsupply;
import java.io.Serializable;
import java.util.List;
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
public interface ValuesProvider extends Serializable {
- List<List<String>> getValues();
+ List<List<String>> getValues(@Nullable Build build, String paramName);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
index 18929a3217..7df579c804 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
@@ -29,7 +29,7 @@ public class DependencyFinishedTrigger extends JobTrigger {
for (ParamSupply param: dependency.getJobParams()) {
if (!param.isSecret()) {
List<String> paramValue = build.getParamMap().get(param.getName());
- if (!param.getValuesProvider().getValues().contains(paramValue))
+ if (!param.getValuesProvider().getValues(null, param.getName()).contains(paramValue))
return null;
}
}
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
new file mode 100644
index 0000000000..9395ebc4d1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -0,0 +1,78 @@
+package io.onedev.server.buildspec.step;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.k8shelper.CommandExecutable;
+import io.onedev.k8shelper.Executable;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobAware;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ComponentContext;
+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.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable(order=100, name="Execute Shell/Batch Commands")
+public class CommandStep extends Step {
+
+ private static final long serialVersionUID = 1L;
+
+ private String image;
+
+ private List<String> commands;
+
+ @Editable(order=100, description="Specify docker image to execute commands inside")
+ @Interpolative(variableSuggester="suggestVariables")
+ @NotEmpty
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ @Editable(order=110, description="Specify content of Linux shell script or Windows command batch to execute "
+ + "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;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getVariables() {
+ List<String> variables = new ArrayList<>();
+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
+ Project project = page.getProject();
+ ObjectId commitId = page.getCommit();
+ BuildSpec buildSpec = ComponentContext.get().getComponent().findParent(BuildSpecAware.class).getBuildSpec();
+ Job job = ComponentContext.get().getComponent().findParent(JobAware.class).getJob();
+ for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, buildSpec, job, ""))
+ variables.add(suggestion.getContent());
+ return variables;
+ }
+
+ @Override
+ public Executable getExecutable(BuildSpec buildSpec) {
+ return new CommandExecutable(image, commands);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
new file mode 100644
index 0000000000..6bdd09efac
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
@@ -0,0 +1,31 @@
+package io.onedev.server.buildspec.step;
+
+import java.io.Serializable;
+
+import io.onedev.k8shelper.Action;
+import io.onedev.k8shelper.Executable;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public abstract class Step implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private boolean alwaysExecute;
+
+ public abstract Executable getExecutable(BuildSpec buildSpec);
+
+ @Editable(order=100000)
+ public boolean isAlwaysExecute() {
+ return alwaysExecute;
+ }
+
+ public void setAlwaysExecute(boolean alwaysExecute) {
+ this.alwaysExecute = alwaysExecute;
+ }
+
+ public Action getAction(BuildSpec buildSpec) {
+ return new Action(alwaysExecute, getExecutable(buildSpec));
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java
new file mode 100644
index 0000000000..23989edd9c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java
@@ -0,0 +1,56 @@
+package io.onedev.server.buildspec.step;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.buildspec.NamedElement;
+import io.onedev.server.buildspec.job.paramspec.ParamSpec;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class StepTemplate implements NamedElement, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private List<Step> steps = new ArrayList<>();
+
+ private List<ParamSpec> paramSpecs = new ArrayList<>();
+
+ @Editable(order=100)
+ @NotEmpty
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, name="Steps to Execute")
+ public List<Step> getSteps() {
+ return steps;
+ }
+
+ public void setSteps(List<Step> steps) {
+ this.steps = steps;
+ }
+
+ @Editable(order=300, name="Parameter Specs", description="Optionally define parameter specifications of the step template")
+ @Valid
+ public List<ParamSpec> getParamSpecs() {
+ return paramSpecs;
+ }
+
+ public void setParamSpecs(List<ParamSpec> paramSpecs) {
+ this.paramSpecs = paramSpecs;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.java
new file mode 100644
index 0000000000..04d0eaf4e2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.java
@@ -0,0 +1,10 @@
+package io.onedev.server.buildspec.step;
+
+import javax.annotation.Nullable;
+
+public interface StepTemplateAware {
+
+ @Nullable
+ StepTemplate getTemplate();
+
+}
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
new file mode 100644
index 0000000000..fb84b87a2d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
@@ -0,0 +1,80 @@
+package io.onedev.server.buildspec.step;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.apache.wicket.Component;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.k8shelper.Action;
+import io.onedev.k8shelper.CompositeExecutable;
+import io.onedev.k8shelper.Executable;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobAware;
+import io.onedev.server.buildspec.job.paramspec.ParamSpec;
+import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
+import io.onedev.server.util.ComponentContext;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.editable.annotation.ParamSpecProvider;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable(order=200, name="Use Step Template", description="Step to use specified template")
+public class UseTemplateStep extends Step {
+
+ private static final long serialVersionUID = 1L;
+
+ private String templateName;
+
+ private List<ParamSupply> params = new ArrayList<>();
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getTemplateName() {
+ return templateName;
+ }
+
+ public void setTemplateName(String templateName) {
+ this.templateName = templateName;
+ }
+
+ @Editable(name="Step Parameters", order=200)
+ @ParamSpecProvider("getParamSpecs")
+ @OmitName
+ @Valid
+ public List<ParamSupply> getParams() {
+ return params;
+ }
+
+ public void setParams(List<ParamSupply> params) {
+ this.params = params;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<ParamSpec> getParamSpecs() {
+ Component component = ComponentContext.get().getComponent();
+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
+ if (jobAware != null) {
+ Job job = jobAware.getJob();
+ if (job != null)
+ return job.getParamSpecs();
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public Executable getExecutable(BuildSpec buildSpec) {
+ StepTemplate template = buildSpec.getStepTemplateMap().get(templateName);
+ if (template == null)
+ throw new ExplicitException("Step template not found: " + templateName);
+ List<Action> actions = new ArrayList<>();
+ for (Step step: template.getSteps())
+ actions.add(step.getAction(buildSpec));
+ return new CompositeExecutable(actions);
+ }
+
+}
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 86d3e2ed63..f7663c0c4c 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
@@ -1012,14 +1012,16 @@ public class Build extends AbstractEntity implements Referenceable {
return Build.class.getName() + ":" + buildId;
}
- public static void push(Build build) {
+ public static void push(@Nullable Build build) {
stack.get().push(build);
- ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));
+ if (build != null)
+ ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));
}
public static void pop() {
- ScriptIdentity.pop();
- stack.get().pop();
+ Build build = stack.get().pop();
+ if (build != null)
+ ScriptIdentity.pop();
}
public boolean isValid() {
@@ -1064,7 +1066,7 @@ public class Build extends AbstractEntity implements Referenceable {
public boolean matchParams(List<ParamSupply> paramSupplies) {
AtomicBoolean matches = new AtomicBoolean(false);
- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(paramSupplies, null)) {
+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(null, paramSupplies)) {
@Override
public void run(Map<String, List<String>> params) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.html
new file mode 100644
index 0000000000..a0c4b54bae
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.html
@@ -0,0 +1,16 @@
+<wicket:panel>
+ <form wicket:id="form" class="import-edit leave-confirm">
+ <div class="modal-header">
+ <h5 id="modal-title" class="modal-title">Import</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.java
new file mode 100644
index 0000000000..efa82cccbf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.java
@@ -0,0 +1,137 @@
+package io.onedev.server.web.editable.buildspec.buildspecimport;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.buildspec.BuildSpecImport;
+import io.onedev.server.util.Path;
+import io.onedev.server.util.PathNode;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class BuildSpecImportEditPanel extends Panel {
+
+ private final List<BuildSpecImport> imports;
+
+ private final int importIndex;
+
+ public BuildSpecImportEditPanel(String id, List<BuildSpecImport> imports, int importIndex) {
+ super(id);
+
+ this.imports = imports;
+ this.importIndex = importIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ BuildSpecImport buildSpecImport;
+ if (importIndex != -1)
+ buildSpecImport = imports.get(importIndex);
+ else
+ buildSpecImport = new BuildSpecImport();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new FencedFeedbackPanel("feedback", form));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(BuildSpecImportEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", buildSpecImport);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (importIndex != -1) {
+ BuildSpecImport oldImport = imports.get(importIndex);
+ if (!buildSpecImport.getProjectName().equals(oldImport.getProjectName())
+ && getImport(buildSpecImport.getProjectName()) != null) {
+ editor.error(new Path(new PathNode.Named("projectName")),
+ "Build spec of this project is already imported");
+ }
+ } else if (getImport(buildSpecImport.getProjectName()) != null) {
+ editor.error(new Path(new PathNode.Named("projectName")),
+ "Build spec of this project is already imported");
+ }
+
+ if (editor.isValid()) {
+ if (importIndex != -1) {
+ imports.set(importIndex, buildSpecImport);
+ } else {
+ imports.add(buildSpecImport);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(BuildSpecImportEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ private BuildSpecImport getImport(String projectName) {
+ for (BuildSpecImport buildSpecImport: imports) {
+ if (projectName.equals(buildSpecImport.getProjectName()))
+ return buildSpecImport;
+ }
+ return null;
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.html
new file mode 100644
index 0000000000..36f6ab2914
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="import-list">
+ <table wicket:id="imports"></table>
+ <div class="foot mt-3">
+ <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.java
new file mode 100644
index 0000000000..19ec9a747e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.java
@@ -0,0 +1,227 @@
+package io.onedev.server.web.editable.buildspec.buildspecimport;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.buildspec.BuildSpecImport;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+class BuildSpecImportListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<BuildSpecImport> imports;
+
+ public BuildSpecImportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ imports = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ imports.add((BuildSpecImport) each);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new BuildSpecImportEditPanel(id, imports, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(BuildSpecImportListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<BuildSpecImport, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Project")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getProjectName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Tag")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getTag()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", BuildSpecImportListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new BuildSpecImportEditPanel(id, imports, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(BuildSpecImportListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ imports.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(BuildSpecImportListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions minimum";
+ }
+
+ });
+
+ IDataProvider<BuildSpecImport> dataProvider = new ListDataProvider<BuildSpecImport>() {
+
+ @Override
+ protected List<BuildSpecImport> getData() {
+ return imports;
+ }
+
+ };
+
+ DataTable<BuildSpecImport, Void> dataTable;
+ add(dataTable = new DataTable<BuildSpecImport, Void>("imports", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(imports, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(imports, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(BuildSpecImportListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (BuildSpecImport each: imports)
+ value.add(each);
+ return value;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.java
new file mode 100644
index 0000000000..d3828a9cd5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.java
@@ -0,0 +1,59 @@
+package io.onedev.server.web.editable.buildspec.buildspecimport;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.buildspec.BuildSpecImport;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class BuildSpecImportListEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == BuildSpecImport.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null)
+ return new BuildSpecImportListViewPanel(id, model.getObject());
+ else
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new BuildSpecImportListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.html
new file mode 100644
index 0000000000..c722a46fd2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.html
@@ -0,0 +1,10 @@
+<wicket:panel>
+ <div class="import-list">
+ <div class="body">
+ <table wicket:id="imports"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="columnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.java
new file mode 100644
index 0000000000..8541ae3a6c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.java
@@ -0,0 +1,182 @@
+package io.onedev.server.web.editable.buildspec.buildspecimport;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.buildspec.BuildSpecImport;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.BeanContext;
+
+@SuppressWarnings("serial")
+class BuildSpecImportListViewPanel extends Panel {
+
+ private final List<BuildSpecImport> imports = new ArrayList<>();
+
+ public BuildSpecImportListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ imports.add((BuildSpecImport) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<BuildSpecImport, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Project")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getProjectName());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Tag")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getTag());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,
+ IModel<BuildSpecImport> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new SpriteImage(componentId, "ellipsis") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon");
+ }
+
+ };
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<BuildSpecImport> dataProvider = new ListDataProvider<BuildSpecImport>() {
+
+ @Override
+ protected List<BuildSpecImport> getData() {
+ return imports;
+ }
+
+ };
+
+ add(new DataTable<BuildSpecImport, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new NoRecordsBehavior());
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ }
+
+ });
+ }
+
+ private abstract class ColumnFragment extends Fragment {
+
+ private final int index;
+
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", BuildSpecImportListViewPanel.this);
+ this.index = index;
+ }
+
+ protected abstract Component newLabel(String componentId);
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Import");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "import"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, imports.get(index));
+ }
+
+ };
+ }
+
+ };
+ link.add(newLabel("label"));
+ add(link);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java
index a40fb06da8..6646eed52d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobChoiceEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.choice;
+package io.onedev.server.web.editable.buildspec.job.choice;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java
index 56138e7ee6..3b2f2f52f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.choice;
+package io.onedev.server.web.editable.buildspec.job.choice;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java
index c2eccc4e35..7933d3c050 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.choice;
+package io.onedev.server.web.editable.buildspec.job.choice;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyEditPanel.java
index d92732350b..ec8f7c4042 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.jobdependency;
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
index e832a5afb6..904cb0aa56 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.jobdependency;
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java
index fb8daeb115..7ce958bfa6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.jobdependency;
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
index 1c31d48631..add0eb2d28 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.jobdependency;
+package io.onedev.server.web.editable.buildspec.job.jobdependency;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.java
index d3ae0bba42..dc771bacf5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.java
index 2ab97411f3..14ec0b3d3b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.java
index 3a67340fd0..d975134c5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.java
index e20b3ecc01..1ff6ccd49b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.java
index ef6c2df0a6..113643f553 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.java
index c82010af61..862bae1617 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramspec;
+package io.onedev.server.web.editable.buildspec.job.paramspec;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/param-spec.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/param-spec.css
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.java
index 06a3203851..945e4101fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramsupply;
+package io.onedev.server.web.editable.buildspec.job.paramsupply;
import java.io.Serializable;
import java.util.ArrayList;
@@ -36,6 +36,7 @@ import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.buildspec.job.paramspec.SecretParam;
import io.onedev.server.buildspec.job.paramsupply.Ignore;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
+import io.onedev.server.buildspec.job.paramsupply.PassthroughValues;
import io.onedev.server.buildspec.job.paramsupply.ScriptingValues;
import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues;
import io.onedev.server.buildspec.job.paramsupply.ValuesProvider;
@@ -48,6 +49,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
import io.onedev.server.web.editable.annotation.Password;
+import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
@SuppressWarnings("serial")
class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@@ -137,10 +139,14 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
List<String> choices = new ArrayList<>();
if (isSecret) {
choices.add(SpecifiedValues.SECRET_DISPLAY_NAME);
+ if (findParent(JobTriggerEditPanel.class) == null)
+ choices.add(PassthroughValues.SECRET_DISPLAY_NAME);
choices.add(ScriptingValues.SECRET_DISPLAY_NAME);
choices.add(Ignore.DISPLAY_NAME);
} else {
choices.add(SpecifiedValues.DISPLAY_NAME);
+ if (findParent(JobTriggerEditPanel.class) == null)
+ choices.add(PassthroughValues.DISPLAY_NAME);
choices.add(ScriptingValues.DISPLAY_NAME);
choices.add(Ignore.DISPLAY_NAME);
}
@@ -157,6 +163,8 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
return isSecret?SpecifiedValues.SECRET_DISPLAY_NAME:SpecifiedValues.DISPLAY_NAME;
else if (valuesProviderClass == ScriptingValues.class)
return isSecret?ScriptingValues.SECRET_DISPLAY_NAME:ScriptingValues.DISPLAY_NAME;
+ else if (valuesProviderClass == PassthroughValues.class)
+ return isSecret?PassthroughValues.SECRET_DISPLAY_NAME:PassthroughValues.DISPLAY_NAME;
else
return Ignore.DISPLAY_NAME;
}
@@ -168,6 +176,8 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
valuesProvider = newSpecifiedValuesProvider(property);
else if (object.equals(ScriptingValues.DISPLAY_NAME) || object.equals(ScriptingValues.SECRET_DISPLAY_NAME))
valuesProvider = new ScriptingValues();
+ else if (object.equals(PassthroughValues.DISPLAY_NAME) || object.equals(PassthroughValues.SECRET_DISPLAY_NAME))
+ valuesProvider = new PassthroughValues();
else
valuesProvider = new Ignore();
container.replace(newValuesEditor("values", property, valuesProvider));
@@ -367,6 +377,8 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
specifiedValues.getValues().add(paramSpec.convertToStrings(propertyValue));
}
param.setValuesProvider(specifiedValues);
+ } else if (valuesProviderClass == PassthroughValues.class) {
+ param.setValuesProvider(new PassthroughValues());
} else {
param.setValuesProvider(new Ignore());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.java
index 724ecb6fef..075a6020c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramsupply;
+package io.onedev.server.web.editable.buildspec.job.paramsupply;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.java
index 4a0834d602..10f8641861 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.paramsupply;
+package io.onedev.server.web.editable.buildspec.job.paramsupply;
import java.io.Serializable;
import java.util.ArrayList;
@@ -12,6 +12,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import io.onedev.server.buildspec.job.paramsupply.Ignore;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
+import io.onedev.server.buildspec.job.paramsupply.PassthroughValues;
import io.onedev.server.buildspec.job.paramsupply.ScriptingValues;
import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues;
import io.onedev.server.web.editable.PropertyContext;
@@ -63,6 +64,9 @@ class ParamListViewPanel extends Panel {
else
paramItem.add(new Label("valuesProvider", ScriptingValues.DISPLAY_NAME));
paramItem.add(PropertyContext.view("values", param.getValuesProvider(), "scriptName"));
+ } else if (param.getValuesProvider() instanceof PassthroughValues) {
+ paramItem.add(new Label("valuesProvider", PassthroughValues.DISPLAY_NAME));
+ paramItem.add(new WebMarkupContainer("values"));
} else {
paramItem.add(new Label("valuesProvider", Ignore.DISPLAY_NAME));
paramItem.add(new WebMarkupContainer("values"));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java
index a9f17d4d52..d9ad42d6d5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.postbuildaction;
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionEditPanel.java
index fb1d7b89a8..fbb9bf2463 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.postbuildaction;
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
index ed4c29ccdb..8b3007a987 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.postbuildaction;
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java
index 1410846eba..c5ccc17fdb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.postbuildaction;
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
index 62178ab52e..0e1502a2ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/PostBuildActionListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.postbuildaction;
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java
index a73e408cad..3caa2f70f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.privilege;
+package io.onedev.server.web.editable.buildspec.job.privilege;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java
index d940440436..39dfa0138d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.privilege;
+package io.onedev.server.web.editable.buildspec.job.privilege;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java
index a20e86ef6d..5c4b7640b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.privilege;
+package io.onedev.server.web.editable.buildspec.job.privilege;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java
index e757f39c2c..0a78e81be0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/JobPrivilegeListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.privilege;
+package io.onedev.server.web.editable.buildspec.job.privilege;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyCssResourceReference.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyCssResourceReference.java
index c079741084..006b359538 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.projectdependency;
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyEditPanel.java
index 7d24fb38f9..240912d4ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.projectdependency;
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
index b23d22ee9e..b3d864c981 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.projectdependency;
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java
index 6585c8cb3c..9281f772d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.projectdependency;
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
index aa331bd5f8..125ec60449 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.projectdependency;
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/project-dependency.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/project-dependency.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/project-dependency.css
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/project-dependency.css
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportBean.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportBean.java
index c519b607eb..f2cfb279dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.report;
+package io.onedev.server.web.editable.buildspec.job.report;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportEditPanel.java
index 235b0418e3..6a57a9fd40 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.report;
+package io.onedev.server.web.editable.buildspec.job.report;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java
index 3f6caeaa34..a415b4c203 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.report;
+package io.onedev.server.web.editable.buildspec.job.report;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditSupport.java
index 5568d075eb..a59b4d52ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.report;
+package io.onedev.server.web.editable.buildspec.job.report;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListViewPanel.java
index ef84e77a66..e3e48b3b43 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/JobReportListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.report;
+package io.onedev.server.web.editable.buildspec.job.report;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.java
index e074239647..f106d7688d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.service;
+package io.onedev.server.web.editable.buildspec.job.service;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.java
index 1349323e81..4f0cc539e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.service;
+package io.onedev.server.web.editable.buildspec.job.service;
import java.io.Serializable;
import java.util.ArrayList;
@@ -140,7 +140,7 @@ class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- columns.add(new AbstractColumn<JobService, Void>(Model.of("Environment")) {
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("Image")) {
@Override
public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.java
index 40bd7102d5..b9dcfe2eae 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.service;
+package io.onedev.server.web.editable.buildspec.job.service;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.java
index 42675f5ce7..31e6f15e8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/JobServiceListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.service;
+package io.onedev.server.web.editable.buildspec.job.service;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java
index 9d0c5fb852..d3b097fbf5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.trigger;
+package io.onedev.server.web.editable.buildspec.job.trigger;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerEditPanel.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerEditPanel.java
index eb2e5a294b..a0763c1922 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.trigger;
+package io.onedev.server.web.editable.buildspec.job.trigger;
import java.util.List;
@@ -17,7 +17,7 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
-abstract class JobTriggerEditPanel extends Panel implements JobAware {
+public abstract class JobTriggerEditPanel extends Panel implements JobAware {
private final List<JobTrigger> triggers;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
index 26c86a1310..6de32051ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.trigger;
+package io.onedev.server.web.editable.buildspec.job.trigger;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java
index 862f46f9db..6b210a5456 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.trigger;
+package io.onedev.server.web.editable.buildspec.job.trigger;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
index a2d4b0fc2c..9948af9227 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.job.trigger;
+package io.onedev.server.web.editable.buildspec.job.trigger;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index 96696ba0cb..cd6defc208 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -132,7 +132,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
public void renderHead(Component component, IHeaderResponse response) {
super.renderHead(component, response);
- String script = String.format("onedev.server.buildSpec.onJobDomReady(%d);", jobIndex);
+ String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", jobIndex);
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
index 04f47f9c70..8eea9f4c00 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html
@@ -3,7 +3,9 @@
<wicket:fragment wicket:id="validFrag">
<div class="head">
<a wicket:id="jobs" class="jobs">Jobs</a>
+ <a wicket:id="stepTemplates" class="step-templates">Step Templates</a>
<a wicket:id="properties" class="properties">Properties</a>
+ <a wicket:id="imports" class="imports">Imports</a>
</div>
<div wicket:id="body" class="body position-aware"></div>
</wicket:fragment>
@@ -11,26 +13,26 @@
<div class="title">Error rendering build spec</div>
<div wicket:id="errorMessage" class="error-message"></div>
</wicket:fragment>
- <wicket:fragment wicket:id="jobsFrag">
+ <wicket:fragment wicket:id="namedElementsFrag">
<div class="side flex-shrink-0">
<!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)
in css -->
<div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
- <a wicket:id="job" class="select btn btn-secondary justify-content-start">
+ <a wicket:id="element" class="select btn btn-secondary justify-content-start">
<wicket:svg href="grip" class="icon drag-indicator flex-shrink-0 mr-1"/>
<span wicket:id="label" class="label"></span>
</a>
- <a wicket:id="deleteJob" title="Delete job" class="delete btn btn-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" title="Delete" class="delete btn btn-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</div></div>
<div class="add btn-group btn-block">
<a wicket:id="create" class="create btn btn-primary justify-content-start">
- <wicket:svg href="plus" class="icon flex-shrink-0 mr-1"></wicket:svg> Add Job
+ <wicket:svg href="plus" class="icon flex-shrink-0 mr-1"></wicket:svg> Add New
</a>
- <a wicket:id="suggestions" class="suggestions btn btn-primary flex-grow-0 flex-shrink-0 btn-icon" title="Job suggestions">
+ <a wicket:id="suggestions" class="suggestions btn btn-primary flex-grow-0 flex-shrink-0 btn-icon" title="Suggestions">
<wicket:svg href="wand" class="icon"/>
</a>
</div>
</div>
- <div wicket:id="job" class="main flex-grow-1 ml-4"></div>
+ <div wicket:id="element" class="main flex-grow-1 ml-4"></div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
index 009b623dd8..834e7e6513 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
@@ -42,15 +42,20 @@ import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.BuildSpecImport;
+import io.onedev.server.buildspec.NamedElement;
import io.onedev.server.buildspec.Property;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.JobSuggestion;
+import io.onedev.server.buildspec.step.StepTemplate;
+import io.onedev.server.buildspec.step.StepTemplateAware;
import io.onedev.server.migration.VersionedYamlDoc;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Indexed;
import io.onedev.server.util.PathNode.Named;
+import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -60,6 +65,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.page.base.BasePage;
@@ -98,312 +104,114 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
BuildSpec buildSpec = (BuildSpec) parseResult;
add(new ValidFragment("content") {
- private void newJobsEdit(@Nullable AjaxRequestTarget target, int activeJobIndex) {
- Fragment jobsEdit = new Fragment("body", "jobsFrag", BuildSpecEditPanel.this) {
+ private void setupJobsEditor(@Nullable AjaxRequestTarget target) {
+ Fragment jobsEditor = new NamedElementsEditor<Job>() {
- private void newJobNav(@Nullable AjaxRequestTarget target, RepeatingView navsView, int jobIndex) {
- WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId(), Model.of(jobIndex));
-
- Fragment jobsEdit = this;
+ @Override
+ protected List<Job> getElements() {
+ return buildSpec.getJobs();
+ }
+
+ @Override
+ protected List<Job> getSuggestedElements() {
+ List<Job> suggestedJobs = new ArrayList<>();
- nav.add(new AjaxSubmitLink("job") {
+ if (context.getBlobIdent().revision != null) {
+ for (JobSuggestion suggestion: OneDev.getExtensions(JobSuggestion.class))
+ suggestedJobs.addAll(suggestion.suggestJobs(context.getProject(), context.getCommit()));
+ }
+ return suggestedJobs;
+ }
- private int getJobIndex() {
- return (int) nav.getDefaultModelObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", new AbstractReadOnlyModel<String>() {
+ @Override
+ protected int getActiveElementIndex() {
+ return BuildSpecRendererProvider.getActiveJobIndex(context, buildSpec);
+ }
- @Override
- public String getObject() {
- return getJob().getName();
- }
-
- }));
- }
+ @Override
+ protected BeanEditor newElementEditor(String componentId, Job element) {
+
+ class JobEditor extends BeanEditor implements JobAware {
- private Job getJob() {
- return buildSpec.getJobs().get(getJobIndex());
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- pushState(target, "jobs/" + getJob().getName());
- newJobEdit(target, nav);
- resizeWindow(target);
+ public JobEditor(String id, NamedElement element) {
+ super(id, new BeanDescriptor(Job.class), Model.of(element));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(jobsEdit);
- resizeWindow(target);
+ public Job getJob() {
+ return (Job) getConvertedInput();
}
-
- });
+ }
- nav.add(new AjaxLink<Void>("deleteJob") {
+ return new JobEditor(componentId, element);
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- int jobIndex = (int) nav.getDefaultModelObject();
- Component jobEdit = jobsEdit.get("job");
- boolean found = false;
- for (Iterator<Component> it = navsView.iterator(); it.hasNext();) {
- Component child = it.next();
- if (child == nav) {
- it.remove();
- found = true;
- } else if (found) {
- child.setDefaultModelObject((int)child.getDefaultModelObject()-1);
- }
- }
- target.appendJavaScript(String.format(
- "$('.build-spec>.jobs>.side>.navs>.nav:eq(%d)').remove();",
- jobIndex));
- buildSpec.getJobs().remove(jobIndex);
- int activeJobIndex = buildSpec.getJobs().indexOf(jobEdit.getDefaultModelObject());
- if (activeJobIndex == -1) {
- if (!buildSpec.getJobs().isEmpty()) {
- newJobEdit(target, navsView.iterator().next());
- } else {
- jobEdit = new WebMarkupContainer("job");
- jobEdit.setOutputMarkupId(true);
- jobsEdit.replace(jobEdit);
- target.add(jobEdit);
- }
- }
- target.appendJavaScript("onedev.server.form.markDirty($('.build-spec').closest('form'));");
- }
-
- });
-
- navsView.add(nav);
-
- if (target != null) {
- String script = String.format(
- "$('.build-spec>.jobs>.side>.navs').append(\"<div id='%s'></div>\");",
- nav.getMarkupId(true));
- target.prependJavaScript(script);
- target.add(nav);
- }
+ };
+
+ if (target != null) {
+ replace(jobsEditor);
+ target.add(jobsEditor);
+ } else {
+ add(jobsEditor);
+ }
+ }
+
+ private void setupStepTemplatesEditor(@Nullable AjaxRequestTarget target) {
+ Fragment stepTemplatesEditor = new NamedElementsEditor<StepTemplate>() {
+
+ @Override
+ protected List<StepTemplate> getElements() {
+ return buildSpec.getStepTemplates();
}
-
- private void newJobEdit(@Nullable AjaxRequestTarget target, Component nav) {
- AbstractPostAjaxBehavior nameChangeBehavior = new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getRequestParameters();
- String name = params.getParameterValue("name").toOptionalString();
-
- String selection = "jobs";
- if (StringUtils.isNotBlank(name))
- selection += "/" + name;
- replaceState(target, selection);
- }
-
- };
-
- int jobIndex = (int) nav.getDefaultModelObject();
- BeanEditor jobEdit = new JobEditor("job", buildSpec.getJobs().get(jobIndex)) {
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (event.getPayload() instanceof FormSubmitted) {
- int jobIndex = (int) nav.getDefaultModelObject();
- buildSpec.getJobs().set(jobIndex, getJob());
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- int jobIndex = (int) nav.getDefaultModelObject();
- CharSequence callback = nameChangeBehavior.getCallbackFunction(CallbackParameter.explicit("name"));
- String script = String.format("onedev.server.buildSpec.onJobDomReady(%d, %s);", jobIndex, callback);
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- };
- jobEdit.add(nameChangeBehavior);
-
- jobEdit.setOutputMarkupId(true);
- if (target != null) {
- replace(jobEdit);
- target.add(jobEdit);
- } else {
- add(jobEdit);
- }
+
+ @Override
+ protected List<StepTemplate> getSuggestedElements() {
+ return new ArrayList<>();
}
-
- @SuppressWarnings("deprecation")
- private void addJob(AjaxRequestTarget target, RepeatingView jobNavs) {
- pushState(target, "new-job");
- int jobIndex = buildSpec.getJobs().size()-1;
- newJobNav(target, jobNavs, jobIndex);
- newJobEdit(target, jobNavs.get(jobNavs.size()-1));
+
+ @Override
+ protected int getActiveElementIndex() {
+ return BuildSpecRendererProvider.getActiveStepTemplateIndex(context, buildSpec);
}
-
- @SuppressWarnings("deprecation")
+
@Override
- protected void onInitialize() {
- super.onInitialize();
-
- Fragment jobsEdit = this;
-
- RepeatingView jobNavs = new RepeatingView("navs");
-
- for (int i=0; i<buildSpec.getJobs().size(); i++)
- newJobNav(null, jobNavs, i);
-
- add(jobNavs);
-
- if (!buildSpec.getJobs().isEmpty()) {
- int jobIndex = activeJobIndex;
- if (jobIndex == -1)
- jobIndex = BuildSpecRendererProvider.getActiveJobIndex(context, buildSpec);
- newJobEdit(null, jobNavs.get(jobIndex));
- } else {
- add(new WebMarkupContainer("job").setOutputMarkupId(true));
- }
+ protected BeanEditor newElementEditor(String componentId, StepTemplate element) {
- List<Job> suggestedJobs = new ArrayList<>();
-
- if (context.getBlobIdent().revision != null) {
- for (JobSuggestion suggestion: OneDev.getExtensions(JobSuggestion.class))
- suggestedJobs.addAll(suggestion.suggestJobs(context.getProject(), context.getCommit()));
- }
+ class StepTemplateEditor extends BeanEditor implements StepTemplateAware {
- AjaxSubmitLink createLink = new AjaxSubmitLink("create") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- buildSpec.getJobs().add(new Job());
- addJob(target, jobNavs);
- resizeWindow(target);
+ public StepTemplateEditor(String id, NamedElement element) {
+ super(id, new BeanDescriptor(StepTemplate.class), Model.of(element));
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(jobsEdit);
- resizeWindow(target);
+ public StepTemplate getTemplate() {
+ return (StepTemplate) getConvertedInput();
}
-
- };
- if (suggestedJobs.isEmpty())
- createLink.add(AttributeAppender.append("class", "no-suggestions"));
-
- add(createLink);
-
- if (!suggestedJobs.isEmpty()) {
- add(new MenuLink("suggestions") {
-
- @Override
- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
- List<MenuItem> menuItems = new ArrayList<>();
- for (Job job: suggestedJobs) {
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return job.getName();
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxSubmitLink(id, createLink.findParent(Form.class)) {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- buildSpec.getJobs().add(job);
- addJob(target, jobNavs);
- resizeWindow(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- dropdown.close();
- target.add(jobsEdit);
- resizeWindow(target);
- }
-
- };
- }
-
- });
- }
- return menuItems;
- }
-
- });
- } else {
- add(new WebMarkupContainer("suggestions").setVisible(false));
}
- add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- int fromIndex = from.getItemIndex();
- int toIndex = to.getItemIndex();
- if (fromIndex < toIndex) {
- for (int i=0; i<toIndex-fromIndex; i++) {
- jobNavs.swap(fromIndex+i, fromIndex+i+1);
- Collections.swap(buildSpec.getJobs(), fromIndex+i, fromIndex+i+1);
- }
- } else {
- for (int i=0; i<fromIndex-toIndex; i++) {
- jobNavs.swap(fromIndex-i, fromIndex-i-1);
- Collections.swap(buildSpec.getJobs(), fromIndex-i, fromIndex-i-1);
- }
- }
- for (int i=0; i<jobNavs.size(); i++)
- jobNavs.get(i).setDefaultModelObject(i);
- }
-
- }.sortable(".side>.navs"));
+ return new StepTemplateEditor(componentId, element);
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildSpec.onTabDomReady('.jobs');"));
- }
-
+
};
- jobsEdit.add(AttributeAppender.append("class", "jobs d-flex flex-nowrap"));
- jobsEdit.setOutputMarkupId(true);
-
if (target != null) {
- replace(jobsEdit);
- target.add(jobsEdit);
+ replace(stepTemplatesEditor);
+ target.add(stepTemplatesEditor);
} else {
- add(jobsEdit);
+ add(stepTemplatesEditor);
}
}
- private void newPropertiesEdit(@Nullable AjaxRequestTarget target) {
- PropertyEditor<Serializable> propertiesEdit = PropertyContext.edit("body", buildSpec, "properties");
- propertiesEdit.add(new Behavior() {
+ private void setupPropertiesEditor(@Nullable AjaxRequestTarget target) {
+ PropertyEditor<Serializable> propertiesEditor = PropertyContext.edit("body", buildSpec, "properties");
+ propertiesEditor.add(new Behavior() {
@SuppressWarnings("unchecked")
@Override
public void onEvent(Component component, IEvent<?> event) {
super.onEvent(component, event);
if (event.getPayload() instanceof FormSubmitted)
- buildSpec.setProperties((List<Property>) propertiesEdit.getConvertedInput());
+ buildSpec.setProperties((List<Property>) propertiesEditor.getConvertedInput());
}
@Override
@@ -413,16 +221,45 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
});
- propertiesEdit.add(AttributeAppender.append("class", "properties d-flex"));
- propertiesEdit.setOutputMarkupId(true);
+ propertiesEditor.add(AttributeAppender.append("class", "properties d-flex"));
+ propertiesEditor.setOutputMarkupId(true);
if (target != null) {
- replace(propertiesEdit);
- target.add(propertiesEdit);
+ replace(propertiesEditor);
+ target.add(propertiesEditor);
} else {
- add(propertiesEdit);
+ add(propertiesEditor);
}
}
+ private void setupImportsEditor(@Nullable AjaxRequestTarget target) {
+ PropertyEditor<Serializable> importsEditor = PropertyContext.edit("body", buildSpec, "imports");
+ importsEditor.add(new Behavior() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onEvent(Component component, IEvent<?> event) {
+ super.onEvent(component, event);
+ if (event.getPayload() instanceof FormSubmitted)
+ buildSpec.setImports((List<BuildSpecImport>) importsEditor.getConvertedInput());
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildSpec.onTabDomReady('.imports');"));
+ }
+
+ });
+ importsEditor.add(AttributeAppender.append("class", "imports d-flex"));
+ importsEditor.setOutputMarkupId(true);
+ if (target != null) {
+ replace(importsEditor);
+ target.add(importsEditor);
+ } else {
+ add(importsEditor);
+ }
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -432,8 +269,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- pushState(target, "jobs");
- newJobsEdit(target, -1);
+ pushState(target, "jobs");
+ setupJobsEditor(target);
resizeWindow(target);
}
@@ -446,13 +283,32 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
});
+ add(new AjaxSubmitLink("stepTemplates") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target, "step-templates");
+ setupStepTemplatesEditor(target);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(getParent());
+ resizeWindow(target);
+ }
+
+ });
+
add(new AjaxSubmitLink("properties") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
pushState(target, "properties");
- newPropertiesEdit(target);
+ setupPropertiesEditor(target);
resizeWindow(target);
}
@@ -465,11 +321,35 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
});
+ add(new AjaxSubmitLink("imports") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target, "imports");
+ setupImportsEditor(target);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(getParent());
+ resizeWindow(target);
+ }
+
+ });
+
String selection = getSelection();
+
if (selection == null || selection.startsWith("jobs") || selection.equals("new-job"))
- newJobsEdit(null, -1);
+ setupJobsEditor(null);
+ else if (selection.startsWith("step-templates") || selection.equals("new-step-template"))
+ setupStepTemplatesEditor(null);
+ else if (selection.equals("imports"))
+ setupImportsEditor(null);
else
- newPropertiesEdit(null);
+ setupPropertiesEditor(null);
add(AttributeAppender.append("class", "valid"));
setOutputMarkupId(true);
@@ -491,21 +371,21 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
case "jobs":
path = new Path(path.getNodes().subList(1, path.getNodes().size()));
if (path.getNodes().isEmpty()) {
- newJobsEdit(target, -1);
- error("Jobs: " + violation.getMessage());
replaceState(target, "jobs");
+ setupJobsEditor(target);
+ error("Jobs: " + violation.getMessage());
} else {
PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next();
path = new Path(path.getNodes().subList(1, path.getNodes().size()));
if (path.getNodes().isEmpty()) {
- newJobsEdit(target, -1);
- error("Job '" + buildSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage());
replaceState(target, "jobs");
+ setupJobsEditor(target);
+ error("Job '" + buildSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage());
} else {
- newJobsEdit(target, indexed.getIndex());
- ((BeanEditor)get("body:job")).error(path, violation.getMessage());
String selection = "jobs/" + buildSpec.getJobs().get(indexed.getIndex()).getName();
replaceState(target, selection);
+ setupJobsEditor(target);
+ ((BeanEditor)get("body:element")).error(path, violation.getMessage());
}
}
break;
@@ -525,6 +405,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
public void onEditCancel(AjaxRequestTarget target) {
if ("new-job".equals(getSelection()))
replaceState(target, "jobs");
+ else if ("new-step-template".equals(getSelection()))
+ replaceState(target, "step-templates");
}
});
@@ -578,19 +460,6 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
return null;
}
- private static class JobEditor extends BeanEditor implements JobAware {
-
- public JobEditor(String id, Job job) {
- super(id, new BeanDescriptor(Job.class), Model.of(job));
- }
-
- @Override
- public Job getJob() {
- return (Job) getConvertedInput();
- }
-
- }
-
private static class FormSubmitted extends AjaxPayload {
public FormSubmitted(AjaxRequestTarget target) {
@@ -622,4 +491,314 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
}
+
+ private abstract class NamedElementsEditor<T extends NamedElement> extends Fragment {
+
+ private final Class<T> elementClass;
+
+ @SuppressWarnings("unchecked")
+ public NamedElementsEditor() {
+ super("body", "namedElementsFrag", BuildSpecEditPanel.this);
+
+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(NamedElementsEditor.class, getClass());
+ elementClass = (Class<T>) typeArguments.get(0);
+ }
+
+ protected abstract List<T> getElements();
+
+ protected abstract List<T> getSuggestedElements();
+
+ protected abstract int getActiveElementIndex();
+
+ protected abstract BeanEditor newElementEditor(String componentId, T element);
+
+ private void newElementNav(@Nullable AjaxRequestTarget target, RepeatingView navsView, int elementIndex) {
+ WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId(), Model.of(elementIndex));
+
+ Fragment elementsEdit = this;
+
+ nav.add(new AjaxSubmitLink("element") {
+
+ private int getElementIndex() {
+ return (int) nav.getDefaultModelObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return getElement().getName();
+ }
+
+ }));
+ }
+
+ private NamedElement getElement() {
+ return getElements().get(getElementIndex());
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target, getTypeName(elementClass) + "s/" + getElement().getName());
+ setupElementEditor(target, nav);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(elementsEdit);
+ resizeWindow(target);
+ }
+
+ });
+
+ nav.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ int elementIndex = (int) nav.getDefaultModelObject();
+ Component elementEdit = elementsEdit.get("element");
+ boolean found = false;
+ for (Iterator<Component> it = navsView.iterator(); it.hasNext();) {
+ Component child = it.next();
+ if (child == nav) {
+ it.remove();
+ found = true;
+ } else if (found) {
+ child.setDefaultModelObject((int)child.getDefaultModelObject()-1);
+ }
+ }
+ target.appendJavaScript(String.format(
+ "$('.build-spec>.elements>.side>.navs>.nav:eq(%d)').remove();",
+ elementIndex));
+ getElements().remove(elementIndex);
+ int activeElementIndex = getElements().indexOf(elementEdit.getDefaultModelObject());
+ if (activeElementIndex == -1) {
+ if (!getElements().isEmpty()) {
+ setupElementEditor(target, navsView.iterator().next());
+ } else {
+ elementEdit = new WebMarkupContainer("element");
+ elementEdit.setOutputMarkupId(true);
+ elementsEdit.replace(elementEdit);
+ target.add(elementEdit);
+ }
+ }
+ target.appendJavaScript("onedev.server.form.markDirty($('.build-spec').closest('form'));");
+ }
+
+ });
+
+ navsView.add(nav);
+
+ if (target != null) {
+ String script = String.format(
+ "$('.build-spec>.elements>.side>.navs').append(\"<div id='%s'></div>\");",
+ nav.getMarkupId(true));
+ target.prependJavaScript(script);
+ target.add(nav);
+ }
+ }
+
+ private String getTypeName(Class<?> typeClass) {
+ return EditableUtils.getDisplayName(typeClass).replace(' ', '-').toLowerCase();
+ }
+
+ private void setupElementEditor(@Nullable AjaxRequestTarget target, Component nav) {
+ AbstractPostAjaxBehavior nameChangeBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getRequestParameters();
+ String name = params.getParameterValue("name").toOptionalString();
+
+ String selection = getTypeName(elementClass) + "s";
+ if (StringUtils.isNotBlank(name))
+ selection += "/" + name;
+ replaceState(target, selection);
+ }
+
+ };
+
+ int elementIndex = (int) nav.getDefaultModelObject();
+ BeanEditor elementEditor = newElementEditor("element", getElements().get(elementIndex));
+
+ elementEditor.add(new Behavior() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onEvent(Component component, IEvent<?> event) {
+ super.onEvent(component, event);
+ if (event.getPayload() instanceof FormSubmitted) {
+ int elementIndex = (int) nav.getDefaultModelObject();
+ getElements().set(elementIndex, (T) elementEditor.getConvertedInput());
+ }
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+
+ int elementIndex = (int) nav.getDefaultModelObject();
+ CharSequence callback = nameChangeBehavior.getCallbackFunction(CallbackParameter.explicit("name"));
+ String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d, %s);", elementIndex, callback);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ });
+ elementEditor.add(nameChangeBehavior);
+
+ elementEditor.setOutputMarkupId(true);
+ if (target != null) {
+ replace(elementEditor);
+ target.add(elementEditor);
+ } else {
+ add(elementEditor);
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ private void addElement(AjaxRequestTarget target, RepeatingView elementNavs) {
+ pushState(target, "new-" + getTypeName(elementClass));
+ int elementIndex = getElements().size()-1;
+ newElementNav(target, elementNavs, elementIndex);
+ setupElementEditor(target, elementNavs.get(elementNavs.size()-1));
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ RepeatingView elementNavs = new RepeatingView("navs");
+
+ for (int i=0; i<getElements().size(); i++)
+ newElementNav(null, elementNavs, i);
+
+ add(elementNavs);
+
+ if (!getElements().isEmpty()) {
+ int elementIndex = getActiveElementIndex();
+ setupElementEditor(null, elementNavs.get(elementIndex));
+ } else {
+ add(new WebMarkupContainer("element").setOutputMarkupId(true));
+ }
+
+ AjaxSubmitLink createLink = new AjaxSubmitLink("create") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ try {
+ getElements().add(elementClass.newInstance());
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ addElement(target, elementNavs);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(NamedElementsEditor.this);
+ resizeWindow(target);
+ }
+
+ };
+
+ List<T> suggestedElements = new ArrayList<>();
+
+ if (suggestedElements.isEmpty())
+ createLink.add(AttributeAppender.append("class", "no-suggestions"));
+
+ add(createLink);
+
+ if (!suggestedElements.isEmpty()) {
+ add(new MenuLink("suggestions") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ for (T element: suggestedElements) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return element.getName();
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxSubmitLink(id, createLink.findParent(Form.class)) {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ getElements().add(element);
+ addElement(target, elementNavs);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ dropdown.close();
+ target.add(NamedElementsEditor.this);
+ resizeWindow(target);
+ }
+
+ };
+ }
+
+ });
+ }
+ return menuItems;
+ }
+
+ });
+ } else {
+ add(new WebMarkupContainer("suggestions").setVisible(false));
+ }
+
+ add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++) {
+ elementNavs.swap(fromIndex+i, fromIndex+i+1);
+ Collections.swap(getElements(), fromIndex+i, fromIndex+i+1);
+ }
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++) {
+ elementNavs.swap(fromIndex-i, fromIndex-i-1);
+ Collections.swap(getElements(), fromIndex-i, fromIndex-i-1);
+ }
+ }
+ for (int i=0; i<elementNavs.size(); i++)
+ elementNavs.get(i).setDefaultModelObject(i);
+ }
+
+ }.sortable(".side>.navs"));
+
+ add(AttributeAppender.append("class", "d-flex flex-nowrap elements " + getTypeName(elementClass) + "s"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("onedev.server.buildSpec.onTabDomReady('.%ss');", getTypeName(elementClass))));
+ }
+
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java
index 70658d2b40..7f20bccbfa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java
@@ -51,6 +51,19 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {
}
}
+ public static int getActiveStepTemplateIndex(BlobRenderContext context, BuildSpec buildSpec) {
+ String selection = getSelection(context.getPosition());
+ if (selection != null && selection.startsWith("step-templates/")) {
+ String activeTemplateName = selection.substring("step-templates/".length());
+ return IntStream.range(0, buildSpec.getStepTemplates().size())
+ .filter(i -> activeTemplateName.equals(buildSpec.getStepTemplates().get(i).getName()))
+ .findFirst()
+ .orElse(0);
+ } else {
+ return 0;
+ }
+ }
+
@Override
public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath())
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
index d4c5337f50..44ae05c583 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
@@ -2,13 +2,13 @@ onedev.server.buildSpec = {
onTabDomReady: function(tabClass) {
$(".build-spec>.head>a").removeClass("active").filter(tabClass).addClass("active");
},
- onJobDomReady: function(jobIndex, nameChangeCallback) {
- var $jobs = $(".build-spec>.jobs");
- var $navs = $jobs.find(">.side>.navs");
- $navs.children().removeClass("active").eq(jobIndex).addClass("active");
+ onNamedElementDomReady: function(elementIndex, nameChangeCallback) {
+ var $elements = $(".build-spec>.elements");
+ var $navs = $elements.find(">.side>.navs");
+ $navs.children().removeClass("active").eq(elementIndex).addClass("active");
if (nameChangeCallback) {
- var $main = $jobs.children(".main");
+ var $main = $elements.children(".main");
var $input = $main.find(">div>div>.property-name input");
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 d7ff5f70d9..65ab2b16e9 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
@@ -99,9 +99,8 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
protected List<Job> load() {
- BuildSpec buildSpec = getProject().getBuildSpec(getBuild().getCommitId());
-
List<Job> downstreamJobs = new ArrayList<>();
+ BuildSpec buildSpec = getProject().getBuildSpec(getBuild().getCommitId());
for (Job job: buildSpec.getJobs()) {
for (JobDependency dependency: job.getJobDependencies()) {
if (dependency.getJobName().equals(getBuild().getJobName())
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 87baec380b..73d968b211 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
@@ -33,8 +33,8 @@ import com.google.common.base.Splitter;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PathUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
@@ -42,6 +42,10 @@ import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.commons.utils.command.ProcessKiller;
import io.onedev.k8shelper.CacheInstance;
+import io.onedev.k8shelper.CommandExecutable;
+import io.onedev.k8shelper.CommandHandler;
+import io.onedev.k8shelper.CompositeExecutable;
+import io.onedev.k8shelper.Executable;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.k8shelper.SshCloneInfo;
import io.onedev.server.OneDev;
@@ -53,9 +57,9 @@ import io.onedev.server.git.config.GitConfig;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.plugin.docker.DockerExecutor.TestData;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.concurrent.CapacityRunner;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
@@ -133,30 +137,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return new Commandline("docker");
}
- private String getImageOS(SimpleLogger jobLogger, String image) {
- Commandline docker = newDocker();
- docker.addArgs("image", "inspect", "-f", "{{.Os}}", image);
-
- AtomicReference<String> osRef = new AtomicReference<>(null);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- osRef.set(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- return Preconditions.checkNotNull(osRef.get());
- }
-
private synchronized CapacityRunner getCapacityRunner() {
if (capacityRunner == null)
capacityRunner = new CapacityRunner(capacity);
@@ -167,10 +147,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return new File(Bootstrap.getSiteDir(), "cache");
}
- private String createNetwork(JobContext jobContext, boolean isWindows, SimpleLogger jobLogger) {
- String network = getName() + "-" + jobContext.getProjectName() + "-"
- + jobContext.getBuildNumber() + "-" + jobContext.getRetried();
-
+ private void createNetwork(String network, JobContext jobContext, SimpleLogger jobLogger) {
AtomicBoolean networkExists = new AtomicBoolean(false);
Commandline docker = newDocker();
docker.addArgs("network", "ls", "-q", "--filter", "name=" + network);
@@ -195,7 +172,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
} else {
docker.clearArgs();
docker.addArgs("network", "create");
- if (isWindows)
+ if (SystemUtils.IS_OS_WINDOWS)
docker.addArgs("-d", "nat");
docker.addArgs(network);
docker.execute(new LineConsumer() {
@@ -214,8 +191,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}).checkReturnCode();
}
-
- return network;
}
private void deleteNetwork(String network, SimpleLogger jobLogger) {
@@ -303,28 +278,11 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
@SuppressWarnings("resource")
private void startService(String network, JobService jobService, SimpleLogger jobLogger) {
- jobLogger.log("Pulling service image...") ;
- Commandline docker = newDocker();
- docker.addArgs("pull", jobService.getImage());
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
jobLogger.log("Creating service container...");
String containerName = network + "-service-" + jobService.getName();
+
+ Commandline docker = newDocker();
docker.clearArgs();
docker.addArgs("run", "-d", "--name=" + containerName, "--network=" + network,
"--network-alias=" + jobService.getName());
@@ -354,7 +312,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
jobLogger.log("Waiting for service to be ready...");
- boolean isWindows = getImageOS(jobLogger, jobService.getImage()).equalsIgnoreCase("windows");
ObjectMapper jsonReader = OneDev.getInstance(ObjectMapper.class);
while (true) {
StringBuilder builder = new StringBuilder();
@@ -386,7 +343,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
if (stateNode.get("Status").asText().equals("running")) {
docker.clearArgs();
docker.addArgs("exec", containerName);
- if (isWindows)
+ if (SystemUtils.IS_OS_WINDOWS)
docker.addArgs("cmd", "/c", jobService.getReadinessCheckCommand());
else
docker.addArgs("sh", "-c", jobService.getReadinessCheckCommand());
@@ -455,8 +412,10 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
@SuppressWarnings("resource")
@Override
public Void call() {
- jobLogger.log(String.format("Executing job (executor: %s, image: %s)...",
- getName(), jobContext.getImage()));
+ String network = getName() + "-" + jobContext.getProjectName() + "-"
+ + jobContext.getBuildNumber() + "-" + jobContext.getRetried();
+
+ jobLogger.log(String.format("Executing job (executor: %s, network: %s)...", getName(), network));
jobContext.notifyJobRunning();
JobManager jobManager = OneDev.getInstance(JobManager.class);
@@ -476,52 +435,31 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
});
login(jobLogger);
-
- jobLogger.log("Pulling job image...") ;
- Commandline docker = newDocker();
- docker.addArgs("pull", jobContext.getImage());
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
- boolean isWindows = getImageOS(jobLogger, jobContext.getImage()).equalsIgnoreCase("windows");
-
- String network = createNetwork(jobContext, isWindows, jobLogger);
+ createNetwork(network, jobContext, jobLogger);
try {
for (JobService jobService: jobContext.getServices()) {
jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");
startService(network, jobService, jobLogger);
}
- File workspaceCache = null;
+ AtomicReference<File> workspaceCache = new AtomicReference<>(null);
for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
if (PathUtils.isCurrent(entry.getValue())) {
- workspaceCache = entry.getKey().getDirectory(hostCacheHome);
+ workspaceCache.set(entry.getKey().getDirectory(hostCacheHome));
break;
}
}
File hostWorkspace;
- if (workspaceCache != null) {
- hostWorkspace = workspaceCache;
+ if (workspaceCache.get() != null) {
+ hostWorkspace = workspaceCache.get();
} else {
hostWorkspace = new File(hostBuildHome, "workspace");
FileUtils.createDir(hostWorkspace);
}
- File hostHome = null;
+ AtomicReference<File> hostHome = new AtomicReference<>(null);
try {
LineConsumer logger = new LineConsumer(StandardCharsets.UTF_8.name()) {
@@ -534,11 +472,11 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
if (jobContext.isRetrieveSource()) {
jobLogger.log("Retrieving source code...");
- hostHome = FileUtils.createTempDir();
+ hostHome.set(FileUtils.createTempDir());
Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
- git.workingDir(hostWorkspace).environments().put("HOME", hostHome.getAbsolutePath());
+ git.workingDir(hostWorkspace).environments().put("HOME", hostHome.get().getAbsolutePath());
- jobContext.getCloneInfo().writeAuthData(hostHome, git, logger, logger);
+ jobContext.getCloneInfo().writeAuthData(hostHome.get(), git, logger, logger);
List<String> trustCertContent = new ArrayList<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
@@ -556,7 +494,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
if (!trustCertContent.isEmpty()) {
- KubernetesHelper.installGitCert(new File(hostHome, "trust-cert.pem"), trustCertContent,
+ KubernetesHelper.installGitCert(new File(hostHome.get(), "trust-cert.pem"), trustCertContent,
git, logger, logger);
}
@@ -585,7 +523,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
*/
Commandline cmd = newDocker();
String containerName = network + "-submodule-update-helper";
- String homeOuterPath = getOuterPath(hostHome.getAbsolutePath());
+ String homeOuterPath = getOuterPath(hostHome.get().getAbsolutePath());
String workspaceOuterPath = getOuterPath(hostWorkspace.getAbsolutePath());
cmd.addArgs("run", "--name=" + containerName, "-v", homeOuterPath + ":/root",
"-v", workspaceOuterPath+ ":/git", "--rm", "alpine/git",
@@ -635,13 +573,13 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
String containerWorkspace;
String containerEntryPoint;
String[] containerCommand;
- if (isWindows) {
+ if (SystemUtils.IS_OS_WINDOWS) {
containerBuildHome = "C:\\onedev-build";
containerWorkspace = "C:\\onedev-build\\workspace";
containerEntryPoint = "cmd";
- if (hostHome != null)
- containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\ContainerAdministrator\\onedev\\* C:\\Users\\ContainerAdministrator>nul && C:\\onedev-build\\job-commands.bat"};
+ if (hostHome.get() != null)
+ containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERHOME%\\onedev\\* C:\\Users\\%USERHOME% > nul && C:\\onedev-build\\job-commands.bat"};
else
containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};
@@ -655,7 +593,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
containerBuildHome = "/onedev-build";
containerWorkspace = "/onedev-build/workspace";
containerEntryPoint = "sh";
- if (hostHome != null)
+ if (hostHome.get() != null)
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"};
@@ -669,73 +607,112 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
jobContext.reportJobWorkspace(containerWorkspace);
-
- String containerName = network + "-job";
- docker.clearArgs();
- docker.addArgs("run", "--name=" + containerName, "--network=" + network);
- if (getRunOptions() != null)
- docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
-
- docker.addArgs("-v", getOuterPath(hostBuildHome.getAbsolutePath()) + ":" + containerBuildHome);
- if (workspaceCache != null)
- docker.addArgs("-v", getOuterPath(workspaceCache.getAbsolutePath()) + ":" + containerWorkspace);
- for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
- if (!PathUtils.isCurrent(entry.getValue())) {
- String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
- String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
- docker.addArgs("-v", getOuterPath(hostCachePath) + ":" + containerCachePath);
- }
- }
-
- if (SystemUtils.IS_OS_LINUX)
- docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
-
- if (hostHome != null) {
- String outerPath = getOuterPath(hostHome.getAbsolutePath());
- if (SystemUtils.IS_OS_WINDOWS)
- docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerAdministrator\\onedev");
- else
- docker.addArgs("-v", outerPath + ":/root/onedev");
- }
-
- docker.addArgs("-w", containerWorkspace, "--entrypoint=" + containerEntryPoint);
- docker.addArgs(jobContext.getImage());
- docker.addArgs(containerCommand);
-
- jobLogger.log("Running job container...");
-
+ Executable entryExecutable = new CompositeExecutable(jobContext.getActions());
try {
- ExecutionResult result = docker.execute(logger, logger, null, new ProcessKiller() {
-
- @Override
- public void kill(Process process, String executionId) {
- jobLogger.log("Stopping job container...");
- Commandline cmd = newDocker();
- cmd.addArgs("stop", containerName);
- cmd.execute(new LineConsumer() {
+ List<String> errorMessages = new ArrayList<>();
+
+ entryExecutable.execute(new CommandHandler() {
- @Override
- public void consume(String line) {
- DockerExecutor.logger.debug(line);
+ @Override
+ public boolean execute(CommandExecutable executable, List<Integer> position) {
+ if (SystemUtils.IS_OS_WINDOWS) {
+ File scriptFile = new File(hostBuildHome, "job-commands.bat");
+ try {
+ FileUtils.writeLines(scriptFile, executable.getCommands(), "\r\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
-
- }, new LineConsumer() {
-
+ } else {
+ File scriptFile = new File(hostBuildHome, "job-commands.sh");
+ try {
+ FileUtils.writeLines(scriptFile, executable.getCommands(), "\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ String stepName = KubernetesHelper.describe(position);
+
+ String containerName = network + "-step-" + stepName;
+ Commandline docker = newDocker();
+ docker.clearArgs();
+ docker.addArgs("run", "--name=" + containerName, "--network=" + network);
+ if (getRunOptions() != null)
+ docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+
+ docker.addArgs("-v", getOuterPath(hostBuildHome.getAbsolutePath()) + ":" + containerBuildHome);
+ if (workspaceCache.get() != null)
+ docker.addArgs("-v", getOuterPath(workspaceCache.get().getAbsolutePath()) + ":" + containerWorkspace);
+ for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
+ if (!PathUtils.isCurrent(entry.getValue())) {
+ String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
+ String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
+ docker.addArgs("-v", getOuterPath(hostCachePath) + ":" + containerCachePath);
+ }
+ }
+
+ if (SystemUtils.IS_OS_LINUX)
+ docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
+
+ if (hostHome.get() != null) {
+ String outerPath = getOuterPath(hostHome.get().getAbsolutePath());
+ if (SystemUtils.IS_OS_WINDOWS) {
+ docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerAdministrator\\onedev");
+ docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerUser\\onedev");
+ } else {
+ docker.addArgs("-v", outerPath + ":/root/onedev");
+ }
+ }
+
+ docker.addArgs("-w", containerWorkspace, "--entrypoint=" + containerEntryPoint);
+ docker.addArgs(executable.getImage());
+
+ docker.addArgs(containerCommand);
+
+ jobLogger.log("Running step #" + stepName + "...");
+
+ ExecutionResult result = docker.execute(logger, logger, null, new ProcessKiller() {
+
@Override
- public void consume(String line) {
- jobLogger.log(line);
+ public void kill(Process process, String executionId) {
+ jobLogger.log("Stopping step container...");
+ Commandline cmd = newDocker();
+ cmd.addArgs("stop", containerName);
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ DockerExecutor.logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
}
- }).checkReturnCode();
+ });
+ if (result.getReturnCode() != 0) {
+ errorMessages.add("Step #" + stepName + ": Command failed with exit code " + result.getReturnCode());
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ @Override
+ public void skip(CommandExecutable executable, List<Integer> position) {
+ jobLogger.log("Skipping step #" + KubernetesHelper.describe(position) + "...");
}
- });
- if (result.getReturnCode() != 0) {
- String logMessage = String.format("Job command failed in build %s#%d",
- jobContext.getProjectName(), jobContext.getBuildNumber());
- DockerExecutor.logger.debug(logMessage, result.buildException());
- throw new ExplicitException("Job command failed with exit code " + result.getReturnCode());
- }
+ }, new ArrayList<>());
+
+ if (!errorMessages.isEmpty())
+ throw new ExplicitException(errorMessages.iterator().next());
} finally {
jobLogger.log("Sending job outcomes...");
@@ -748,6 +725,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
}
}
+
jobLogger.log("Reporting job caches...");
jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
@@ -756,8 +734,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
- if (hostHome != null)
- FileUtils.deleteDir(hostHome);
+ if (hostHome.get() != null)
+ FileUtils.deleteDir(hostHome.get());
}
} finally {
deleteNetwork(network, jobLogger);
@@ -896,31 +874,11 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
public void test(TestData testData, SimpleLogger jobLogger) {
login(jobLogger);
- jobLogger.log("Pulling image...");
-
- Commandline cmd = newDocker();
- cmd.addArgs("pull", testData.getDockerImage());
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- boolean windows = getImageOS(jobLogger, testData.getDockerImage()).equals("windows");
-
jobLogger.log("Running container...");
File workspaceDir = null;
File cacheDir = null;
+
+ Commandline cmd = newDocker();
try {
workspaceDir = Bootstrap.createTempDir("workspace");
cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
@@ -932,7 +890,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
String containerWorkspacePath;
String containerCachePath;
- if (windows) {
+ if (SystemUtils.IS_OS_WINDOWS) {
containerWorkspacePath = "C:\\onedev-build\\workspace";
containerCachePath = "C:\\onedev-build\\cache";
} else {
@@ -945,7 +903,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
cmd.addArgs("-w", containerWorkspacePath);
cmd.addArgs(testData.getDockerImage());
- if (windows)
+ if (SystemUtils.IS_OS_WINDOWS)
cmd.addArgs("cmd", "/c", "echo hello from container");
else
cmd.addArgs("sh", "-c", "echo hello from container");
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 f0a5cefb77..27ba98d598 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
@@ -1,5 +1,10 @@
package io.onedev.server.plugin.executor.kubernetes;
+import static io.onedev.k8shelper.KubernetesHelper.ENV_JOB_TOKEN;
+import static io.onedev.k8shelper.KubernetesHelper.ENV_SERVER_URL;
+import static io.onedev.k8shelper.KubernetesHelper.LOG_END_MESSAGE;
+import static io.onedev.k8shelper.KubernetesHelper.describe;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -11,6 +16,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -19,13 +25,16 @@ import java.util.Map;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+
import javax.annotation.Nullable;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,14 +42,18 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.k8shelper.Action;
+import io.onedev.k8shelper.CommandExecutable;
+import io.onedev.k8shelper.CommandVisitor;
+import io.onedev.k8shelper.CompositeExecutable;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.CacheSpec;
import io.onedev.server.buildspec.job.EnvVar;
@@ -54,9 +67,9 @@ import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.util.CollectionUtils;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -71,6 +84,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private static final long serialVersionUID = 1L;
+ private static final int POD_WATCH_TIMEOUT = 120;
+
private static final Logger logger = LoggerFactory.getLogger(KubernetesExecutor.class);
private static final int MAX_AFFINITY_WEIGHT = 10;
@@ -175,12 +190,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void execute(String jobToken, JobContext jobContext) {
- execute(jobContext.getImage(), jobToken, jobContext.getLogger(), jobContext);
+ execute(jobToken, jobContext.getLogger(), jobContext);
}
@Override
public void test(TestData testData, SimpleLogger jobLogger) {
- execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, jobLogger, null);
+ execute(KubernetesResource.TEST_JOB_TOKEN, jobLogger, testData.getDockerImage());
}
private Commandline newKubeCtl() {
@@ -592,8 +607,6 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
jobLogger.log("Waiting for service to be ready...");
- checkEventError(namespace, podName, jobLogger);
-
OsInfo baselineOsInfo = getBaselineOsInfo(nodeSelector, jobLogger);
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
while (true) {
@@ -611,63 +624,55 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
JsonNode statusNode;
try {
- statusNode = mapper.readTree(baos.toString()).get("status");
+ statusNode = mapper.readTree(baos.toString()).get("status");
} catch (IOException e) {
throw new RuntimeException(e);
}
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (containerStatusesNode != null) {
- JsonNode containerStatusNode = containerStatusesNode.iterator().next();
- JsonNode stateNode = containerStatusNode.get("state");
- if (stateNode.get("running") != null) {
- kubectl.clearArgs();
- kubectl.addArgs("exec", podName, "-n", namespace, "--");
- if (baselineOsInfo.isLinux())
- kubectl.addArgs("bash", "-c");
- else
- kubectl.addArgs("cmd.exe", "/c");
- kubectl.addArgs(jobService.getReadinessCheckCommand());
- ExecutionResult result = kubectl.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log("Service readiness check: " + line);
- }
-
- }, new LineConsumer() {
+ checkConditions(statusNode, jobLogger);
+
+ List<JsonNode> containerStatusNodes = new ArrayList<>();
+ containerStatusNodes.add(statusNode.get("containerStatuses").iterator().next());
+
+ Map<String, ContainerError> containerErrors = getContainerErrors(containerStatusNodes);
+ if (!containerErrors.isEmpty()) {
+ ContainerError error = containerErrors.values().iterator().next();
+ if (!error.isFatal())
+ collectContainerLog(namespace, podName, "default", null, jobLogger);
+ throw new ExplicitException("Service " + jobService.getName() + ": " + error.getMessage());
+ }
+
+ if (!getStoppedContainers(containerStatusNodes).isEmpty()) {
+ collectContainerLog(namespace, podName, "default", null, jobLogger);
+ throw new ExplicitException("Service " + jobService.getName() + " is stopped unexpectedly");
+ }
+
+ if (!getStartedContainers(containerStatusNodes).isEmpty()) {
+ kubectl.clearArgs();
+ kubectl.addArgs("exec", podName, "-n", namespace, "--");
+ if (baselineOsInfo.isLinux())
+ kubectl.addArgs("sh", "-c");
+ else
+ kubectl.addArgs("cmd.exe", "/c");
+ kubectl.addArgs(jobService.getReadinessCheckCommand());
+ ExecutionResult result = kubectl.execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- jobLogger.log("Service readiness check: " + line);
- }
-
- });
- if (result.getReturnCode() == 0) {
- jobLogger.log("Service is ready");
- break;
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
}
- } else if (stateNode.get("terminated") != null) {
- JsonNode terminatedNode = stateNode.get("terminated");
- JsonNode reasonNode = terminatedNode.get("reason");
- String reason = null;
- if (reasonNode != null && !reasonNode.asText().equals("Error") && !reasonNode.asText().equals("Completed"))
- reason = reasonNode.asText();
+
+ }, new LineConsumer() {
- JsonNode messageNode = terminatedNode.get("message");
- if (messageNode != null) {
- if (reason != null)
- reason += ": " + messageNode.asText();
- else
- reason = messageNode.asText();
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
}
- if (reason != null)
- jobLogger.log(reason);
-
- collectContainerLog(namespace, podName, "default", null, jobLogger);
- String message = "Service '" + jobService.getName() + "' is stopped unexpectedly";
- throw new ExplicitException(message);
+ });
+ if (result.getReturnCode() == 0) {
+ jobLogger.log("Service is ready");
+ break;
}
}
@@ -686,8 +691,14 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return map;
}
- private void execute(String dockerImage, String jobToken, SimpleLogger jobLogger, @Nullable JobContext jobContext) {
+ private void execute(String jobToken, SimpleLogger jobLogger, Object executionContext) {
jobLogger.log("Checking cluster access...");
+ JobContext jobContext;
+ if (executionContext instanceof JobContext)
+ jobContext = (JobContext) executionContext;
+ else
+ jobContext = null;
+
Commandline kubectl = newKubeCtl();
kubectl.addArgs("cluster-info");
kubectl.execute(new LineConsumer() {
@@ -706,21 +717,22 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}).checkReturnCode();
- String namespace = getName() + "-";
+ String namespace ;
if (jobContext != null) {
- namespace += jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-"
+ namespace = getName() + "-" + jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-"
+ jobContext.getBuildNumber() + "-" + jobContext.getRetried();
} else {
- namespace += "executor-test";
+ namespace = getName() + "-executor-test";
}
if (getClusterRole() != null)
createClusterRoleBinding(namespace, jobLogger);
+
try {
createNamespace(namespace, jobContext, jobLogger);
- jobLogger.log(String.format("Executing job (executor: %s, namespace: %s, image: %s)...",
- getName(), namespace, dockerImage));
+ jobLogger.log(String.format("Executing job (executor: %s, namespace: %s)...",
+ getName(), namespace));
try {
String imagePullSecretName = createImagePullSecret(namespace, jobLogger);
if (jobContext != null) {
@@ -735,13 +747,11 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
OsInfo baselineOsInfo = getBaselineOsInfo(getNodeSelector(), jobLogger);
Map<String, Object> podSpec = new LinkedHashMap<>();
+
+ List<Map<Object, Object>> containerSpecs = new ArrayList<>();
- Map<Object, Object> mainContainerSpec = CollectionUtils.newHashMap(
- "name", "main",
- "image", dockerImage);
-
- String k8sHelperClassPath;
String containerBuildHome;
+ String containerCommandHome;
String containerCacheHome;
String containerUserHome;
String trustCertsHome;
@@ -749,20 +759,16 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
if (baselineOsInfo.isLinux()) {
containerBuildHome = "/onedev-build";
containerCacheHome = containerBuildHome + "/cache";
+ containerCommandHome = containerBuildHome + "/command";
containerUserHome = "/root/onedev";
trustCertsHome = containerBuildHome + "/trust-certs";
- k8sHelperClassPath = "/k8s-helper/*";
- mainContainerSpec.put("command", Lists.newArrayList("sh"));
- mainContainerSpec.put("args", Lists.newArrayList(containerBuildHome + "/commands.sh"));
dockerSock = "/var/run/docker.sock";
} else {
containerBuildHome = "C:\\onedev-build";
containerCacheHome = containerBuildHome + "\\cache";
+ containerCommandHome = containerBuildHome + "\\command";
containerUserHome = "C:\\Users\\ContainerAdministrator\\onedev";
trustCertsHome = containerBuildHome + "\\trust-certs";
- k8sHelperClassPath = "C:\\k8s-helper\\*";
- mainContainerSpec.put("command", Lists.newArrayList("cmd"));
- mainContainerSpec.put("args", Lists.newArrayList("/c", containerBuildHome + "\\commands.bat"));
dockerSock = null;
}
@@ -772,6 +778,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Map<String, String> userHomeMount = CollectionUtils.newLinkedHashMap(
"name", "user-home",
"mountPath", containerUserHome);
+
+ // Windows nanoserver default user is ContainerUser
+ Map<String, String> userHomeMount2 = CollectionUtils.newLinkedHashMap(
+ "name", "user-home",
+ "mountPath", "C:\\Users\\ContainerUser\\onedev");
+
Map<String, String> cacheHomeMount = CollectionUtils.newLinkedHashMap(
"name", "cache-home",
"mountPath", containerCacheHome);
@@ -783,27 +795,59 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"mountPath", dockerSock);
List<Object> volumeMounts = Lists.<Object>newArrayList(buildHomeMount, userHomeMount, cacheHomeMount);
+ if (baselineOsInfo.isWindows())
+ volumeMounts.add(userHomeMount2);
if (trustCertsConfigMapName != null)
volumeMounts.add(trustCertsMount);
if (dockerSock != null)
volumeMounts.add(dockerSockMount);
-
- mainContainerSpec.put("volumeMounts", volumeMounts);
-
+
+ CompositeExecutable entryExecutable;
if (jobContext != null) {
- mainContainerSpec.put("resources", CollectionUtils.newLinkedHashMap("requests", CollectionUtils.newLinkedHashMap(
- "cpu", jobContext.getCpuRequirement(),
- "memory", jobContext.getMemoryRequirement())));
+ entryExecutable = new CompositeExecutable(jobContext.getActions());
+ } else {
+ List<Action> actions = new ArrayList<>();
+ CommandExecutable executable = new CommandExecutable((String) executionContext,
+ Lists.newArrayList("this does not matter"));
+ actions.add(new Action(true, executable));
+ entryExecutable = new CompositeExecutable(actions);
}
-
- List<Map<Object, Object>> envs = new ArrayList<>();
- envs.add(CollectionUtils.newLinkedHashMap(
- "name", KubernetesHelper.ENV_SERVER_URL,
- "value", getServerUrl()));
- envs.add(CollectionUtils.newLinkedHashMap(
- "name", KubernetesHelper.ENV_JOB_TOKEN,
- "value", jobToken));
+
+ List<String> containerNames = Lists.newArrayList("init");
+
+ entryExecutable.traverse(new CommandVisitor<Void>() {
+ @Override
+ public Void visit(CommandExecutable executable, List<Integer> position) {
+ String containerName = getContainerName(position);
+ containerNames.add(containerName);
+ Map<Object, Object> stepContainerSpec = CollectionUtils.newHashMap(
+ "name", containerName,
+ "image", executable.getImage());
+
+ if (baselineOsInfo.isLinux()) {
+ stepContainerSpec.put("command", Lists.newArrayList("sh"));
+ stepContainerSpec.put("args", Lists.newArrayList(containerCommandHome + "/" + describe(position) + ".sh"));
+ } else {
+ stepContainerSpec.put("command", Lists.newArrayList("cmd"));
+ stepContainerSpec.put("args", Lists.newArrayList("/c", containerCommandHome + "\\" + describe(position) + ".bat"));
+ }
+
+ stepContainerSpec.put("volumeMounts", volumeMounts);
+ containerSpecs.add(stepContainerSpec);
+
+ return null;
+ }
+
+ }, new ArrayList<>());
+
+ String k8sHelperClassPath;
+ if (baselineOsInfo.isLinux()) {
+ k8sHelperClassPath = "/k8s-helper/*";
+ } else {
+ k8sHelperClassPath = "C:\\k8s-helper\\*";
+ }
+
List<String> sidecarArgs = Lists.newArrayList(
"-classpath", k8sHelperClassPath,
"io.onedev.k8shelper.SideCar");
@@ -824,6 +868,22 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
throw new RuntimeException(e);
}
+ List<Map<Object, Object>> envs = new ArrayList<>();
+ envs.add(CollectionUtils.newLinkedHashMap(
+ "name", ENV_SERVER_URL,
+ "value", getServerUrl()));
+ envs.add(CollectionUtils.newLinkedHashMap(
+ "name", ENV_JOB_TOKEN,
+ "value", jobToken));
+
+ Map<Object, Object> initContainerSpec = CollectionUtils.newHashMap(
+ "name", "init",
+ "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,
+ "command", Lists.newArrayList("java"),
+ "args", initArgs,
+ "env", envs,
+ "volumeMounts", volumeMounts);
+
Map<Object, Object> sidecarContainerSpec = CollectionUtils.newHashMap(
"name", "sidecar",
"image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,
@@ -832,15 +892,16 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"env", envs,
"volumeMounts", volumeMounts);
- Map<Object, Object> initContainerSpec = CollectionUtils.newHashMap(
- "name", "init",
- "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,
- "command", Lists.newArrayList("java"),
- "args", initArgs,
- "env", envs,
- "volumeMounts", volumeMounts);
+ if (jobContext != null) {
+ sidecarContainerSpec.put("resources", CollectionUtils.newLinkedHashMap("requests", CollectionUtils.newLinkedHashMap(
+ "cpu", jobContext.getCpuRequirement(),
+ "memory", jobContext.getMemoryRequirement())));
+ }
+
+ containerSpecs.add(sidecarContainerSpec);
+ containerNames.add("sidecar");
- podSpec.put("containers", Lists.<Object>newArrayList(mainContainerSpec, sidecarContainerSpec));
+ podSpec.put("containers", containerSpecs);
podSpec.put("initContainers", Lists.<Object>newArrayList(initContainerSpec));
Map<Object, Object> affinity = getAffinity(jobContext);
@@ -894,118 +955,104 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
createResource(podDef, Sets.newHashSet(), jobLogger);
String podFQN = namespace + "/" + podName;
- jobLogger.log("Preparing job environment...");
- logger.debug("Checking error events (pod: {})...", podFQN);
- // Some errors only reported via events
- checkEventError(namespace, podName, jobLogger);
+ AtomicReference<String> nodeNameRef = new AtomicReference<>(null);
- logger.debug("Waiting for init container to start (pod: {})...", podFQN);
- watchPod(namespace, podName, new StatusChecker() {
+ watchPod(namespace, podName, new AbortChecker() {
@Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
- if (isContainerStarted(initContainerStatusesNode, "init"))
- return new StopWatch(null);
- else
+ public Abort check(String nodeName, Collection<JsonNode> containerStatusNodes) {
+ if (nodeName != null) {
+ nodeNameRef.set(nodeName);
+ return new Abort(null);
+ } else {
return null;
+ }
}
}, jobLogger);
if (jobContext != null)
jobContext.notifyJobRunning();
-
- AtomicReference<String> nodeNameRef = new AtomicReference<>(null);
-
- kubectl.clearArgs();
- kubectl.addArgs("get", "pod", podName, "-n", namespace, "-o", "jsonpath={.spec.nodeName}");
- kubectl.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- nodeNameRef.set(line);
- }
-
- }, new LineConsumer() {
- @Override
- public void consume(String line) {
- jobLogger.log("Kubernetes: " + line);
- }
-
- }).checkReturnCode();
-
String nodeName = Preconditions.checkNotNull(nodeNameRef.get());
- jobLogger.log("Running job pod on node " + nodeName + "...");
-
- logger.debug("Collecting init container log (pod: {})...", podFQN);
- collectContainerLog(namespace, podName, "init", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
+ jobLogger.log("Running job on node " + nodeName + "...");
if (jobContext != null && isCreateCacheLabels())
updateCacheLabels(nodeName, jobContext, jobLogger);
- logger.debug("Waiting for main container to start (pod: {})...", podFQN);
- watchPod(namespace, podName, new StatusChecker() {
-
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
- String errorMessage = getContainerError(initContainerStatusesNode, "init");
- if (errorMessage != null)
- return new StopWatch(new ExplicitException("Error executing init logic: " + errorMessage));
-
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (isContainerStarted(containerStatusesNode, "main"))
- return new StopWatch(null);
- else
- return null;
- }
-
- }, jobLogger);
+ jobLogger.log("Starting job containers...");
- logger.debug("Collecting main container log (pod: {})...", podFQN);
- collectContainerLog(namespace, podName, "main", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
+ List<String> errorMessages = new ArrayList<>();
- logger.debug("Waiting for sidecar container to start (pod: {})...", podFQN);
- watchPod(namespace, podName, new StatusChecker() {
-
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (isContainerStarted(containerStatusesNode, "sidecar"))
- return new StopWatch(null);
- else
- return null;
- }
+ for (String containerName: containerNames) {
+ logger.debug("Waiting for start of container (pod: {}, container: {})...",
+ podFQN, containerName);
- }, jobLogger);
-
- logger.debug("Collecting sidecar container log (pod: {})...", podFQN);
- collectContainerLog(namespace, podName, "sidecar", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
-
- logger.debug("Checking execution result (pod: {})...", podFQN);
- watchPod(namespace, podName, new StatusChecker() {
+ watchPod(namespace, podName, new AbortChecker() {
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- String errorMessage = getContainerError(containerStatusesNode, "main");
- if (errorMessage != null) {
- return new StopWatch(new ExplicitException(errorMessage));
- } else {
- errorMessage = getContainerError(containerStatusesNode, "sidecar");
- if (errorMessage != null)
- return new StopWatch(new ExplicitException("Error executing sidecar logic: " + errorMessage));
- else if (isContainerStopped(containerStatusesNode, "sidecar"))
- return new StopWatch(null);
- else
+ @Override
+ public Abort check(String nodeName, Collection<JsonNode> containerStatusNodes) {
+ ContainerError error = getContainerErrors(containerStatusNodes).get(containerName);
+ if (error != null) {
+ /*
+ * For non-fatal errors (command exited with non-zero code), we abort the watch
+ * without an exception, and will continue to collect the container log which
+ * might contain error details
+ */
+ if (error.isFatal())
+ return new Abort(containerName + ": " + error.getMessage());
+ else
+ return new Abort(null);
+ } else if (getStartedContainers(containerStatusNodes).contains(containerName)) {
+ return new Abort(null);
+ } else {
return null;
+ }
}
- }
+
+ }, jobLogger);
- }, jobLogger);
+ logger.debug("Collecting log of container (pod: {}, container: {})...",
+ podFQN, containerName);
+
+ collectContainerLog(namespace, podName, containerName, LOG_END_MESSAGE, jobLogger);
+
+ logger.debug("Waiting for stop of container (pod: {})...",
+ podFQN, containerName);
+
+ watchPod(namespace, podName, new AbortChecker() {
+
+ @Override
+ public Abort check(String nodeName, Collection<JsonNode> containerStatusNodes) {
+ ContainerError error = getContainerErrors(containerStatusNodes).get(containerName);
+ if (error != null) {
+ String errorMessage = containerName + ": " + error.getMessage();
+ errorMessages.add(errorMessage);
+ /*
+ * We abort the watch with an exception for two reasons:
+ *
+ * 1. Init container error will prevent other containers to start.
+ * 2. Step containers may not run command in case of fatal error and sidecar
+ * container will wait indefinitely on the successful/failed mark file in
+ * this case, causing log following last indefinitely
+ */
+ if (error.isFatal() || containerName.equals("init"))
+ return new Abort(errorMessage);
+ else
+ return new Abort(null);
+ } else if (getStoppedContainers(containerStatusNodes).contains(containerName)) {
+ return new Abort(null);
+ } else {
+ return null;
+ }
+ }
+
+ }, jobLogger);
+ }
+
+ if (!errorMessages.isEmpty())
+ throw new ExplicitException(errorMessages.iterator().next());
if (jobContext != null && isCreateCacheLabels())
updateCacheLabels(nodeName, jobContext, jobLogger);
@@ -1018,67 +1065,76 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- @Nullable
- private String getContainerError(@Nullable JsonNode containerStatusesNode, String containerName) {
- if (containerStatusesNode != null) {
- for (JsonNode containerStatusNode: containerStatusesNode) {
- JsonNode stateNode = containerStatusNode.get("state");
- if (containerStatusNode.get("name").asText().equals(containerName)) {
- JsonNode terminatedNode = stateNode.get("terminated");
- if (terminatedNode != null) {
- String reason;
- JsonNode reasonNode = terminatedNode.get("reason");
- if (reasonNode != null)
- reason = reasonNode.asText();
- else
- reason = "Unknown reason";
-
- if (!reason.equals("Completed")) {
- JsonNode messageNode = terminatedNode.get("message");
- if (messageNode != null) {
- return messageNode.asText();
- } else {
- JsonNode exitCodeNode = terminatedNode.get("exitCode");
- if (exitCodeNode != null && exitCodeNode.asInt() != 0)
- return "Job command failed with exit code " + exitCodeNode.asText();
- else
- return reason;
- }
+ private String getContainerName(List<Integer> stepPosition) {
+ return "step-" + describe(stepPosition);
+ }
+
+ private Map<String, ContainerError> getContainerErrors(Collection<JsonNode> containerStatusNodes) {
+ Map<String, ContainerError> containerErrors = new HashMap<>();
+ for (JsonNode containerStatusNode: containerStatusNodes) {
+ String containerName = containerStatusNode.get("name").asText();
+
+ JsonNode stateNode = containerStatusNode.get("state");
+ JsonNode waitingNode = stateNode.get("waiting");
+ if (waitingNode != null) {
+ String reason = waitingNode.get("reason").asText();
+ if (reason.equals("ErrImagePull") || reason.equals("InvalidImageName")
+ || reason.equals("ImageInspectError") || reason.equals("ErrImageNeverPull")
+ || reason.equals("RegistryUnavailable")) {
+ JsonNode messageNode = waitingNode.get("message");
+ if (messageNode != null)
+ containerErrors.put(containerName, new ContainerError(messageNode.asText(), true));
+ else
+ containerErrors.put(containerName, new ContainerError(reason, true));
+ }
+ }
+
+ if (!containerErrors.containsKey(containerName)) {
+ JsonNode terminatedNode = stateNode.get("terminated");
+ if (terminatedNode != null) {
+ String reason;
+ JsonNode reasonNode = terminatedNode.get("reason");
+ if (reasonNode != null)
+ reason = reasonNode.asText();
+ else
+ reason = "Unknown reason";
+
+ if (!reason.equals("Completed")) {
+ JsonNode messageNode = terminatedNode.get("message");
+ if (messageNode != null) {
+ containerErrors.put(containerName, new ContainerError(messageNode.asText(), true));
+ } else {
+ JsonNode exitCodeNode = terminatedNode.get("exitCode");
+ if (exitCodeNode != null && exitCodeNode.asInt() != 0)
+ containerErrors.put(containerName, new ContainerError("Command failed with exit code " + exitCodeNode.asText(), false));
+ else
+ containerErrors.put(containerName, new ContainerError(reason, true));
}
}
- break;
}
}
}
- return null;
+ return containerErrors;
}
- private boolean isContainerStarted(@Nullable JsonNode containerStatusesNode, String containerName) {
- if (containerStatusesNode != null) {
- for (JsonNode containerStatusNode: containerStatusesNode) {
- if (containerStatusNode.get("name").asText().equals(containerName)) {
- JsonNode stateNode = containerStatusNode.get("state");
- if (stateNode.get("running") != null || stateNode.get("terminated") != null)
- return true;
- break;
- }
- }
+ private Collection<String> getStartedContainers(Collection<JsonNode> containerStatusNodes) {
+ Collection<String> startedContainers = new HashSet<>();
+ for (JsonNode containerStatusNode: containerStatusNodes) {
+ JsonNode stateNode = containerStatusNode.get("state");
+ if (stateNode.get("running") != null || stateNode.get("terminated") != null)
+ startedContainers.add(containerStatusNode.get("name").asText());
}
- return false;
+ return startedContainers;
}
- private boolean isContainerStopped(@Nullable JsonNode containerStatusesNode, String containerName) {
- if (containerStatusesNode != null) {
- for (JsonNode containerStatusNode: containerStatusesNode) {
- if (containerStatusNode.get("name").asText().equals(containerName)) {
- JsonNode stateNode = containerStatusNode.get("state");
- if (stateNode.get("terminated") != null)
- return true;
- break;
- }
- }
+ private Collection<String> getStoppedContainers(Collection<JsonNode> containerStatusNodes) {
+ Collection<String> stoppedContainers = new ArrayList<>();
+ for (JsonNode containerStatusNode: containerStatusNodes) {
+ JsonNode stateNode = containerStatusNode.get("state");
+ if (stateNode.get("terminated") != null)
+ stoppedContainers.add(containerStatusNode.get("name").asText());
}
- return false;
+ return stoppedContainers;
}
private void updateCacheLabels(String nodeName, JobContext jobContext, SimpleLogger jobLogger) {
@@ -1166,183 +1222,114 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void watchPod(String namespace, String podName, StatusChecker statusChecker, SimpleLogger jobLogger) {
+ private void checkConditions(JsonNode statusNode, SimpleLogger jobLogger) {
+ JsonNode conditionsNode = statusNode.get("conditions");
+ if (conditionsNode != null) {
+ for (JsonNode conditionNode: conditionsNode) {
+ if (conditionNode.get("type").asText().equals("PodScheduled")
+ && conditionNode.get("status").asText().equals("False")
+ && conditionNode.get("reason").asText().equals("Unschedulable")) {
+ jobLogger.log("Kubernetes: " + conditionNode.get("message").asText());
+ }
+ }
+ }
+ }
+
+ private void watchPod(String namespace, String podName, AbortChecker abortChecker, SimpleLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
- AtomicReference<StopWatch> stopWatchRef = new AtomicReference<>(null);
+ AtomicReference<Abort> abortRef = new AtomicReference<>(null);
StringBuilder json = new StringBuilder();
kubectl.addArgs("get", "pod", podName, "-n", namespace, "--watch", "-o", "json");
+ kubectl.timeout(POD_WATCH_TIMEOUT);
Thread thread = Thread.currentThread();
- try {
- kubectl.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("{")) {
- json.append("{").append("\n");
- } else if (line.startsWith("}")) {
- json.append("}");
- logger.trace("Pod watching output:\n" + json.toString());
- try {
- process(mapper.readTree(json.toString()));
- } catch (Exception e) {
- logger.error("Error processing pod watching output", e);
- }
- json.setLength(0);
- } else {
- json.append(line).append("\n");
- }
- }
-
- private void process(JsonNode podNode) {
- String errorMessage = null;
- JsonNode statusNode = podNode.get("status");
- JsonNode conditionsNode = statusNode.get("conditions");
- if (conditionsNode != null) {
- for (JsonNode conditionNode: conditionsNode) {
- if (conditionNode.get("type").asText().equals("PodScheduled")
- && conditionNode.get("status").asText().equals("False")
- && conditionNode.get("reason").asText().equals("Unschedulable")) {
- jobLogger.log("Kubernetes: " + conditionNode.get("message").asText());
- }
- }
- }
-
- Collection<JsonNode> containerStatusNodes = new ArrayList<>();
- JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
- if (initContainerStatusesNode != null) {
- for (JsonNode containerStatusNode: initContainerStatusesNode)
- containerStatusNodes.add(containerStatusNode);
- }
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (containerStatusesNode != null) {
- for (JsonNode containerStatusNode: containerStatusesNode)
- containerStatusNodes.add(containerStatusNode);
- }
-
- for (JsonNode containerStatusNode: containerStatusNodes) {
- JsonNode stateNode = containerStatusNode.get("state");
- JsonNode waitingNode = stateNode.get("waiting");
- if (waitingNode != null) {
- String reason = waitingNode.get("reason").asText();
- if (reason.equals("ErrImagePull") || reason.equals("InvalidImageName")
- || reason.equals("ImageInspectError") || reason.equals("ErrImageNeverPull")
- || reason.equals("RegistryUnavailable")) {
- JsonNode messageNode = waitingNode.get("message");
- if (messageNode != null)
- errorMessage = messageNode.asText();
- else
- errorMessage = reason;
- break;
- }
- }
- }
- if (errorMessage != null)
- stopWatchRef.set(new StopWatch(new ExplicitException(errorMessage)));
- else
- stopWatchRef.set(statusChecker.check(statusNode));
- if (stopWatchRef.get() != null)
- thread.interrupt();
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log("Kubernetes: " + line);
- }
-
- }).checkReturnCode();
-
- throw new ExplicitException("Unexpected end of pod watching");
- } catch (Exception e) {
- StopWatch stopWatch = stopWatchRef.get();
- if (stopWatch != null) {
- if (stopWatch.getException() != null)
- throw stopWatch.getException();
- } else {
- throw ExceptionUtils.unchecked(e);
- }
- }
- }
-
- private void checkEventError(String namespace, String podName, SimpleLogger jobLogger) {
- Commandline kubectl = newKubeCtl();
- ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ while (true) {
+ try {
+ kubectl.execute(new LineConsumer() {
- StringBuilder json = new StringBuilder();
- kubectl.addArgs("get", "event", "-n", namespace, "--field-selector",
- "involvedObject.kind=Pod,involvedObject.name=" + podName, "--watch",
- "-o", "json");
- Thread thread = Thread.currentThread();
- AtomicReference<StopWatch> stopWatchRef = new AtomicReference<>(null);
- try {
- kubectl.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (stopWatchRef.get() == null) {
+ @Override
+ public void consume(String line) {
if (line.startsWith("{")) {
json.append("{").append("\n");
} else if (line.startsWith("}")) {
json.append("}");
- logger.trace("Checking event:\n" + json.toString());
+ logger.trace("Pod watching output:\n" + json.toString());
try {
- JsonNode eventNode = mapper.readTree(json.toString());
- String type = eventNode.get("type").asText();
- String reason = eventNode.get("reason").asText();
- JsonNode messageNode = eventNode.get("message");
- String message = messageNode!=null? messageNode.asText(): reason;
- if (type.equals("Warning")) {
- if (reason.equals("FailedScheduling"))
- jobLogger.log("Kubernetes: " + message);
- else
- stopWatchRef.set(new StopWatch(new ExplicitException(message)));
- } else if (type.equals("Normal") && reason.equals("Started")) {
- stopWatchRef.set(new StopWatch(null));
- }
- if (stopWatchRef.get() != null)
- thread.interrupt();
+ process(mapper.readTree(json.toString()));
} catch (Exception e) {
- logger.error("Error processing event watching record", e);
+ logger.error("Error processing pod watching output", e);
}
json.setLength(0);
} else {
json.append(line).append("\n");
}
}
- }
+
+ private void process(JsonNode podNode) {
+ JsonNode statusNode = podNode.get("status");
+ checkConditions(statusNode, jobLogger);
+
+ if (abortRef.get() == null) {
+ String nodeName = null;
+ JsonNode specNode = podNode.get("spec");
+ if (specNode != null) {
+ JsonNode nodeNameNode = specNode.get("nodeName");
+ if (nodeNameNode != null)
+ nodeName = nodeNameNode.asText();
+ }
+
+ Collection<JsonNode> containerStatusNodes = new ArrayList<>();
+ JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
+ if (initContainerStatusesNode != null) {
+ for (JsonNode containerStatusNode: initContainerStatusesNode)
+ containerStatusNodes.add(containerStatusNode);
+ }
+ JsonNode containerStatusesNode = statusNode.get("containerStatuses");
+ if (containerStatusesNode != null) {
+ for (JsonNode containerStatusNode: containerStatusesNode)
+ containerStatusNodes.add(containerStatusNode);
+ }
+
+ abortRef.set(abortChecker.check(nodeName, containerStatusNodes));
+
+ if (abortRef.get() != null)
+ thread.interrupt();
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Kubernetes: " + line);
+ }
+
+ }).checkReturnCode();
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log("Kubernetes: " + line);
+ throw new ExplicitException("Unexpected end of pod watching");
+ } catch (Exception e) {
+ Abort abort = abortRef.get();
+ if (abort != null) {
+ if (abort.getErrorMessage() != null)
+ throw new ExplicitException(abort.getErrorMessage());
+ else
+ break;
+ } else if (ExceptionUtils.find(e, TimeoutException.class) == null){
+ throw ExceptionUtils.unchecked(e);
}
-
- }).checkReturnCode();
-
- throw new ExplicitException("Unexpected end of event watching");
- } catch (Exception e) {
- StopWatch stopWatch = stopWatchRef.get();
- if (stopWatch != null) {
- if (stopWatch.getException() != null)
- throw stopWatch.getException();
- } else {
- throw ExceptionUtils.unchecked(e);
- }
- }
+ }
+ }
}
private void collectContainerLog(String namespace, String podName, String containerName,
@Nullable String logEndMessage, SimpleLogger jobLogger) {
Thread thread = Thread.currentThread();
- AtomicReference<String> errorMessageRef = new AtomicReference<>(null);
+ AtomicReference<Boolean> abortError = new AtomicReference<>(false);
AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);
@@ -1361,10 +1348,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
logger.debug(line);
} else if (logEndMessage != null && line.contains(logEndMessage)) {
endOfLogSeenRef.set(true);
- } else if (line.contains("Error from server") && line.contains("containerLogs")
- && (line.contains("EOF") || line.contains("Connection refused"))) {
- errorMessageRef.set(line);
- thread.interrupt();
+ } else if (line.startsWith("Error from server") || line.startsWith("error:")) {
+ System.out.println(line);
+ jobLogger.log(line);
+ if (!abortError.get()) {
+ abortError.set(true);
+ thread.interrupt();
+ }
} else if (line.contains(" ")) {
String timestamp = StringUtils.substringBefore(line, " ");
try {
@@ -1385,13 +1375,11 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
try {
kubectl.execute(logConsumer, logConsumer).checkReturnCode();
} catch (Exception e) {
- if (errorMessageRef.get() != null)
- throw new ExplicitException(errorMessageRef.get());
- else
+ if (!abortError.get())
throw ExceptionUtils.unchecked(e);
}
- if (logEndMessage == null || endOfLogSeenRef.get()) {
+ if (logEndMessage == null || endOfLogSeenRef.get() || abortError.get() != null) {
break;
} else {
try {
@@ -1403,23 +1391,45 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private static interface StatusChecker {
+ private static interface AbortChecker {
- StopWatch check(JsonNode statusNode);
+ @Nullable
+ Abort check(@Nullable String nodeName, Collection<JsonNode> containerStatusNodes);
}
- private static class StopWatch {
+ private static class Abort {
- private final RuntimeException exception;
+ private final String errorMessage;
- public StopWatch(@Nullable RuntimeException exception) {
- this.exception = exception;
+ public Abort(@Nullable String errorMessage) {
+ this.errorMessage = errorMessage;
}
@Nullable
- public RuntimeException getException() {
- return exception;
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ }
+
+ private static class ContainerError {
+
+ private final String message;
+
+ private final boolean fatal;
+
+ public ContainerError(String message, boolean fatal) {
+ this.message = message;
+ this.fatal = fatal;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public boolean isFatal() {
+ return fatal;
}
}
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 10aad74294..24cefd9ea3 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
@@ -64,6 +64,7 @@ public class KubernetesResource {
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());
contextMap.put("projectName", context.getProjectName());
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java
index 5477173278..51e326f4fd 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java
@@ -19,7 +19,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.code.CodeProblem.Severity;
import io.onedev.server.model.Build;
@@ -58,7 +58,7 @@ public class JobCheckstyleReport extends JobReport {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java
index 2246cc9d6f..fdfcf6bf55 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java
@@ -21,7 +21,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.model.CloverMetric;
@@ -60,7 +60,7 @@ public class JobCloverReport extends JobReport {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestTestReport.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestTestReport.java
index 4e41bd605b..2ee58bd991 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestTestReport.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestTestReport.java
@@ -16,7 +16,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.model.JestTestMetric;
@@ -50,7 +50,7 @@ public class JobJestTestReport extends JobReport {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
index efcafaa8bf..1b6096356e 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
@@ -41,7 +41,7 @@ public class JobMarkdownReport extends JobReport {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobPullRequestMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobPullRequestMarkdownReport.java
index e5103ed151..7de92b5374 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobPullRequestMarkdownReport.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobPullRequestMarkdownReport.java
@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
-import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
@@ -47,7 +47,7 @@ public class JobPullRequestMarkdownReport extends JobReport {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return Job.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith);
}
@Override