Skip to content

The Unified and Autonomous Development Platform

Step improvements

Robin Shenee8d1aae7f41
diff --git a/pom.xml b/pom.xml
index c5a787f1d0..90f03097ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.0.5</version>
</parent>
<artifactId>server</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 46791af358..01a37dc12c 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<build>
<plugins>
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 505dec9369..a0fce58fc4 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
@@ -42,6 +42,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobDependency;
@@ -543,13 +544,15 @@ public class BuildSpec implements Serializable, Validatable {
return null;
}
- public static List<InputSuggestion> suggestVariables(String matchWith) {
+ public static List<InputSuggestion> suggestVariables(String matchWith,
+ boolean withBuildVersion, boolean withFiles) {
List<InputSuggestion> suggestions = new ArrayList<>();
BuildSpec buildSpec = get();
if (buildSpec != null) {
ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
suggestions.addAll(SuggestionUtils.suggestVariables(
- page.getProject(), buildSpec, ParamSpec.list(), matchWith));
+ page.getProject(), buildSpec, ParamSpec.list(),
+ matchWith, withBuildVersion, withFiles));
}
return suggestions;
}
@@ -752,4 +755,146 @@ public class BuildSpec implements Serializable, Validatable {
}
}
+ @SuppressWarnings("unused")
+ private void migrate6(VersionedYamlDoc doc, Stack<Integer> versions) {
+ for (NodeTuple specTuple: doc.getValue()) {
+ if (((ScalarNode)specTuple.getKeyNode()).getValue().equals("jobs")) {
+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();
+ for (Node jobsNodeItem: jobsNode.getValue()) {
+ MappingNode jobNode = (MappingNode) jobsNodeItem;
+ boolean retrieveSource = false;
+ Node cloneCredentialNode = null;
+ Node cloneDepthNode = null;
+ Node artifactsNode = null;
+ SequenceNode reportsNode = null;
+ SequenceNode stepsNode = null;
+ List<MappingNode> actionNodes = new ArrayList<>();
+ for (Iterator<NodeTuple> itJobTuple = jobNode.getValue().iterator(); itJobTuple.hasNext();) {
+ NodeTuple jobTuple = itJobTuple.next();
+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();
+ if (jobTupleKey.equals("retrieveSource")) {
+ retrieveSource = ((ScalarNode)jobTuple.getValueNode()).getValue().equals("true");
+ itJobTuple.remove();
+ } else if (jobTupleKey.equals("cloneCredential")) {
+ cloneCredentialNode = jobTuple.getValueNode();
+ itJobTuple.remove();
+ } else if (jobTupleKey.equals("cloneDepth")) {
+ cloneDepthNode = jobTuple.getValueNode();
+ itJobTuple.remove();
+ } else if (jobTupleKey.equals("artifacts")) {
+ artifactsNode = jobTuple.getValueNode();
+ itJobTuple.remove();
+ } else if (jobTupleKey.equals("reports")) {
+ reportsNode = (SequenceNode) jobTuple.getValueNode();
+ itJobTuple.remove();
+ } else if (jobTupleKey.equals("steps")) {
+ stepsNode = (SequenceNode) jobTuple.getValueNode();
+ } else if (jobTupleKey.equals("postBuildActions")) {
+ SequenceNode actionsNode = (SequenceNode) jobTuple.getValueNode();
+ for (Iterator<Node> itActionNode = actionsNode.getValue().iterator(); itActionNode.hasNext();) {
+ MappingNode actionNode = (MappingNode) itActionNode.next();
+ String tagName = actionNode.getTag().getValue();
+ if (tagName.equals("!CreateTagAction") || tagName.equals("!CloseMilestoneAction")) {
+ actionNodes.add(actionNode);
+ itActionNode.remove();
+ }
+ }
+ if (actionsNode.getValue().isEmpty())
+ itJobTuple.remove();
+ }
+ }
+ Preconditions.checkState(cloneCredentialNode != null && stepsNode != null);
+ if (retrieveSource) {
+ List<NodeTuple> stepTuples = new ArrayList<>();
+ stepTuples.add(new NodeTuple(new ScalarNode(Tag.STR, "cloneCredential"), cloneCredentialNode));
+ if (cloneDepthNode != null)
+ stepTuples.add(new NodeTuple(new ScalarNode(Tag.STR, "cloneDepth"), cloneDepthNode));
+ stepTuples.add(new NodeTuple(
+ new ScalarNode(Tag.STR, "condition"),
+ new ScalarNode(Tag.STR, "ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL")));
+ Node stepNode = new MappingNode(new Tag("!CheckoutStep"), stepTuples, FlowStyle.BLOCK);
+ stepsNode.getValue().add(0, stepNode);
+ }
+ if (artifactsNode != null) {
+ List<NodeTuple> stepTuples = new ArrayList<>();
+ stepTuples.add(new NodeTuple(new ScalarNode(Tag.STR, "artifacts"), artifactsNode));
+ stepTuples.add(new NodeTuple(
+ new ScalarNode(Tag.STR, "condition"),
+ new ScalarNode(Tag.STR, "ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL")));
+ Node stepNode = new MappingNode(new Tag("!PublishArtifactStep"), stepTuples, FlowStyle.BLOCK);
+ stepsNode.getValue().add(stepNode);
+ }
+ if (reportsNode != null) {
+ for (Node reportsNodeItem: reportsNode.getValue()) {
+ MappingNode reportNode = (MappingNode) reportsNodeItem;
+ List<NodeTuple> stepTuples = new ArrayList<>();
+ stepTuples.addAll(reportNode.getValue());
+ stepTuples.add(new NodeTuple(
+ new ScalarNode(Tag.STR, "condition"),
+ new ScalarNode(Tag.STR, "ALWAYS")));
+ String tagName = reportNode.getTag().getValue();
+ tagName = tagName.replaceFirst("Job", "Publish") + "Step";
+ Node stepNode = new MappingNode(new Tag(tagName), stepTuples, FlowStyle.BLOCK);
+ stepsNode.getValue().add(stepNode);
+ }
+ }
+ for (MappingNode actionNode: actionNodes) {
+ String tagName = actionNode.getTag().getValue().replace("Action", "Step");
+ List<NodeTuple> stepTuples = new ArrayList<>();
+ for (NodeTuple tuple: actionNode.getValue()) {
+ String key = ((ScalarNode)tuple.getKeyNode()).getValue();
+ if (!key.equals("condition"))
+ stepTuples.add(tuple);
+ }
+ stepTuples.add(new NodeTuple(
+ new ScalarNode(Tag.STR, "condition"),
+ new ScalarNode(Tag.STR, "ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL")));
+ Node stepNode = new MappingNode(new Tag(tagName), stepTuples, FlowStyle.BLOCK);
+ stepsNode.getValue().add(stepNode);
+ }
+ }
+ }
+ }
+
+ for (NodeTuple specTuple: doc.getValue()) {
+ String specObjectKey = ((ScalarNode)specTuple.getKeyNode()).getValue();
+ if (specObjectKey.equals("jobs")) {
+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();
+ for (Node jobsNodeItem: jobsNode.getValue()) {
+ MappingNode jobNode = (MappingNode) jobsNodeItem;
+ for (NodeTuple jobTuple: jobNode.getValue()) {
+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();
+ if (jobTupleKey.equals("steps")) {
+ SequenceNode stepsNode = (SequenceNode) jobTuple.getValueNode();
+ for (Node stepsNodeItem: stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ String tagName = stepNode.getTag().getValue();
+ String stepName = WordUtils.uncamel(tagName.substring(1)).replace("Step", "").toLowerCase();
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "name"),
+ new ScalarNode(Tag.STR, stepName)));
+ }
+ }
+ }
+ }
+ } else if (specObjectKey.equals("stepTemplates")) {
+ SequenceNode stepTemplatesNode = (SequenceNode) specTuple.getValueNode();
+ for (Node stepTemplatesNodeItem: stepTemplatesNode.getValue()) {
+ MappingNode stepTemplateNode = (MappingNode) stepTemplatesNodeItem;
+ for (NodeTuple stepTemplateTuple: stepTemplateNode.getValue()) {
+ String stepTemplateTupleKey = ((ScalarNode)stepTemplateTuple.getKeyNode()).getValue();
+ if (stepTemplateTupleKey.equals("steps")) {
+ SequenceNode stepsNode = (SequenceNode) stepTemplateTuple.getValueNode();
+ for (Node stepsNodeItem: stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ String tagName = stepNode.getTag().getValue();
+ String stepName = WordUtils.uncamel(tagName.substring(1)).replace("Step", "").toLowerCase();
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "name"),
+ new ScalarNode(Tag.STR, stepName)));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Property.java b/server-core/src/main/java/io/onedev/server/buildspec/Property.java
index a6446a17eb..9e3fccaba3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Property.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Property.java
@@ -10,7 +10,6 @@ import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.SuggestionProvider;
@Editable
@@ -46,7 +45,6 @@ public class Property implements NamedElement, Serializable {
}
@Editable(order=200)
- @Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getValue() {
return value;
@@ -58,7 +56,7 @@ public class Property implements NamedElement, Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Service.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
index a330d7cb37..b84e7c1507 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Service.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
@@ -128,7 +128,7 @@ public class Service implements NamedElement, Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
}
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 6205a7ada2..5db67fcdf1 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
@@ -48,7 +48,7 @@ public class CacheSpec implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
}
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 d42817a0f6..dff33c5574 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
@@ -1,5 +1,8 @@
package io.onedev.server.buildspec.job;
+import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;
+import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.function.Consumer;
+import java.util.function.Function;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -52,7 +56,6 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.CacheInstance;
-import io.onedev.k8shelper.CloneInfo;
import io.onedev.k8shelper.CompositeExecutable;
import io.onedev.k8shelper.Executable;
import io.onedev.k8shelper.LeafExecutable;
@@ -119,6 +122,8 @@ import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
+import io.onedev.server.web.editable.EditableStringTransformer;
+import io.onedev.server.web.editable.annotation.Interpolative;
@Singleton
public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource {
@@ -369,8 +374,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Long buildNumber = build.getNumber();
String projectName = build.getProject().getName();
File projectGitDir = build.getProject().getGitDir();
- CloneInfo cloneInfo = job.getCloneCredential().newCloneInfo(build, jobToken);
-
+
AtomicReference<JobExecution> executionRef = new AtomicReference<>(null);
executionRef.set(new JobExecution(executorService.submit(new Runnable() {
@@ -394,7 +398,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
for (Step step: job.getSteps()) {
step = interpolator.interpolateProperties(step);
- actions.add(step.getAction(build, build.getParamCombination()));
+ actions.add(step.getAction(build, jobToken, build.getParamCombination()));
}
for (CacheSpec cache: job.getCaches())
@@ -423,8 +427,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Build.push(build);
try {
return new JobContext(projectName, buildNumber, projectGitDir,
- actions, job.isRetrieveSource(), job.getCloneDepth(),
- cloneInfo, job.getCpuRequirement(), job.getMemoryRequirement(),
+ actions, job.getCpuRequirement(), job.getMemoryRequirement(),
commitId, caches, executor.getCacheTTL(), retried.get(),
services, jobLogger) {
@@ -459,11 +462,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
@Override
- public void runServerStep(List<Integer> stepPosition, File filesDir, SimpleLogger logger) {
- sessionManager.run(new Runnable() {
+ public Map<String, byte[]> runServerStep(List<Integer> stepPosition, File filesDir,
+ Map<String, String> placeholderValues, SimpleLogger logger) {
+ return sessionManager.call(new Callable<Map<String, byte[]>>() {
@Override
- public void run() {
+ public Map<String, byte[]> call() {
Executable entryExecutable = new CompositeExecutable(getActions());
LeafVisitor<LeafExecutable> visitor = new LeafVisitor<LeafExecutable>() {
@@ -480,7 +484,17 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ServerExecutable serverExecutable = (ServerExecutable) entryExecutable.traverse(visitor, new ArrayList<>());
ServerStep serverStep = (ServerStep) serverExecutable.getStep();
- serverStep.run(buildManager.load(buildId), filesDir, logger);
+
+ serverStep = new EditableStringTransformer(new Function<String, String>() {
+
+ @Override
+ public String apply(String t) {
+ return replacePlaceholders(t, placeholderValues);
+ }
+
+ }).transformProperties(serverStep, Interpolative.class);
+
+ return serverStep.run(buildManager.load(buildId), filesDir, logger);
}
});
@@ -1080,6 +1094,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Build.push(build);
try {
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
+ Map<String, String> placeholderValues = new HashMap<>();
+ placeholderValues.put(BUILD_VERSION, build.getVersion());
for (PostBuildAction action: build.getJob().getPostBuildActions()) {
action = interpolator.interpolateProperties(action);
if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))
@@ -1199,8 +1215,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
@Override
- public void runServerStep(String jobToken, List<Integer> stepPosition, File filesDir, SimpleLogger logger) {
- getJobContext(jobToken, true).runServerStep(stepPosition, filesDir, logger);
+ public Map<String, byte[]> runServerStep(String jobToken, List<Integer> stepPosition,
+ File filesDir, Map<String, String> placeholderValues, SimpleLogger logger) {
+ return getJobContext(jobToken, true).runServerStep(stepPosition, filesDir, placeholderValues, logger);
}
}
\ No newline at end of file
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 e9498667ed..66c978e60a 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
@@ -7,7 +7,7 @@ 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.util.validation.annotation.EnvironmentName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -22,7 +22,7 @@ public class EnvVar implements Serializable {
@Editable(order=100, description="Specify name of the environment variable")
@Interpolative(variableSuggester="suggestVariables")
- @VariableName
+ @EnvironmentName
@NotEmpty
public String getName() {
return name;
@@ -45,7 +45,7 @@ public class EnvVar implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
}
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 3b911f060b..5c595789a7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import javax.ws.rs.core.HttpHeaders;
@@ -38,18 +37,14 @@ 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.trigger.JobTrigger;
import io.onedev.server.buildspec.param.ParamUtils;
import io.onedev.server.buildspec.param.spec.ParamSpec;
-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.PullRequest;
import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.EditContext;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
@@ -57,7 +52,6 @@ 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.RetryCondition;
-import io.onedev.server.web.editable.annotation.ShowCondition;
import io.onedev.server.web.editable.annotation.SuggestionProvider;
import io.onedev.server.web.util.WicketUtils;
@@ -87,12 +81,6 @@ public class Job implements NamedElement, Serializable, Validatable {
private List<ParamSpec> paramSpecs = new ArrayList<>();
- private boolean retrieveSource = true;
-
- private Integer cloneDepth;
-
- private GitCredential cloneCredential = new DefaultCredential();
-
private List<JobDependency> jobDependencies = new ArrayList<>();
private List<ProjectDependency> projectDependencies = new ArrayList<>();
@@ -119,10 +107,6 @@ public class Job implements NamedElement, Serializable, Validatable {
private transient Map<String, ParamSpec> paramSpecMap;
- public Job() {
- steps.add(new CommandStep());
- }
-
@Editable(order=100, description="Specify name of the job")
@SuggestionProvider("getNameSuggestions")
@NotEmpty
@@ -146,7 +130,7 @@ public class Job implements NamedElement, Serializable, Validatable {
return new ArrayList<>();
}
- @Editable(order=200)
+ @Editable(order=200, description="Steps will be executed serially on same node, sharing the same <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
@Size(min=1, max=1000, message="At least one step needs to be configured")
public List<Step> getSteps() {
return steps;
@@ -156,7 +140,7 @@ public class Job implements NamedElement, Serializable, Validatable {
this.steps = steps;
}
- @Editable(order=300, name="Parameter Specs", group="Params & Triggers", description="Optionally define parameter specifications of the job")
+ @Editable(order=400, name="Parameter Specs", group="Params & Triggers", description="Optionally define parameter specifications of the job")
@Valid
public List<ParamSpec> getParamSpecs() {
return paramSpecs;
@@ -176,44 +160,6 @@ public class Job implements NamedElement, Serializable, Validatable {
this.triggers = triggers;
}
- @Editable(order=250, group="Source Retrieval", description="Whether or not to retrieve repository files")
- public boolean isRetrieveSource() {
- return retrieveSource;
- }
-
- public void setRetrieveSource(boolean retrieveSource) {
- this.retrieveSource = retrieveSource;
- }
-
- @Editable(order=251, group="Source Retrieval", description="Optionally specify depth for a shallow clone in order "
- + "to speed up source retrieval")
- @ShowCondition("isRetrieveSourceEnabled")
- public Integer getCloneDepth() {
- return cloneDepth;
- }
-
- public void setCloneDepth(Integer cloneDepth) {
- this.cloneDepth = cloneDepth;
- }
-
- @Editable(order=252, group="Source Retrieval", description="By default code is cloned via an auto-generated credential, "
- + "which only has read permission over current project. In case the job needs to <a href='$docRoot/pages/push-in-job.md' target='_blank'>push code to server</a>, or want "
- + "to <a href='$docRoot/pages/clone-submodules-via-ssh.md' target='_blank'>clone private submodules</a>, you should supply custom credential with appropriate permissions here")
- @ShowCondition("isRetrieveSourceEnabled")
- @NotNull
- public GitCredential getCloneCredential() {
- return cloneCredential;
- }
-
- public void setCloneCredential(GitCredential cloneCredential) {
- this.cloneCredential = cloneCredential;
- }
-
- @SuppressWarnings("unused")
- private static boolean isRetrieveSourceEnabled() {
- return (boolean) EditContext.get().getInputValue("retrieveSource");
- }
-
@Editable(name="Job Dependencies", order=9110, group="Dependencies & Services", description="Job dependencies determines the order and "
+ "concurrency when run different jobs. You may also specify artifacts to retrieve from upstream jobs")
@Valid
@@ -506,7 +452,7 @@ public class Job implements NamedElement, Serializable, Validatable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
}
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 70ac9f5ebb..7f8c60f7e8 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
@@ -10,7 +10,6 @@ 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.buildspec.Service;
import io.onedev.server.util.SimpleLogger;
@@ -24,12 +23,6 @@ public abstract class JobContext {
private final List<Action> actions;
- private final boolean retrieveSource;
-
- private final Integer cloneDepth;
-
- private final CloneInfo cloneInfo;
-
private final String cpuRequirement;
private final String memoryRequirement;
@@ -51,17 +44,13 @@ public abstract class JobContext {
private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();
public JobContext(String projectName, Long buildNumber, File projectGitDir,
- List<Action> actions, boolean retrieveSource, Integer cloneDepth,
- CloneInfo cloneInfo, String cpuRequirement, String memoryRequirement,
+ List<Action> actions, String cpuRequirement, String memoryRequirement,
ObjectId commitId, Collection<CacheSpec> caches, int cacheTTL,
int retried, List<Service> services, SimpleLogger logger) {
this.projectName = projectName;
this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
this.actions = actions;
- this.retrieveSource = retrieveSource;
- this.cloneDepth = cloneDepth;
- this.cloneInfo = cloneInfo;
this.cpuRequirement = cpuRequirement;
this.memoryRequirement = memoryRequirement;
this.commitId = commitId;
@@ -92,18 +81,6 @@ public abstract class JobContext {
return commitId;
}
- public boolean isRetrieveSource() {
- return retrieveSource;
- }
-
- public Integer getCloneDepth() {
- return cloneDepth;
- }
-
- public CloneInfo getCloneInfo() {
- return cloneInfo;
- }
-
public String getCpuRequirement() {
return cpuRequirement;
}
@@ -144,7 +121,8 @@ public abstract class JobContext {
public abstract void reportJobWorkspace(String jobWorkspace);
- public abstract void runServerStep(List<Integer> stepPosition, File filesDir, SimpleLogger logger);
+ public abstract Map<String, byte[]> runServerStep(List<Integer> stepPosition,
+ File filesDir, Map<String, String> placeholderValues, SimpleLogger logger);
public abstract void copyDependencies(File targetDir);
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 05b1492598..3fb629c07c 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
@@ -21,6 +21,7 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.VariableOption;
import io.onedev.server.web.util.WicketUtils;
@Editable
@@ -59,6 +60,7 @@ public class JobDependency implements Serializable {
@Editable(order=200, name="Job Parameters")
@ParamSpecProvider("getParamSpecs")
+ @VariableOption(withBuildVersion=false, withFile=false)
@OmitName
public List<ParamSupply> getJobParams() {
return jobParams;
@@ -69,7 +71,7 @@ public class JobDependency implements Serializable {
}
@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "
- + "from the dependency into repository root. Leave empty to do not retrieve any artifacts")
+ + "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. Leave empty to do not retrieve any artifacts")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@NameOfEmptyValue("Do not retrieve")
@@ -83,7 +85,7 @@ public class JobDependency implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
@SuppressWarnings("unused")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
index 56759cd473..11e0790f11 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
@@ -31,6 +31,7 @@ public interface JobManager {
void reportJobCaches(String jobToken, Collection<CacheInstance> cacheInstances);
- void runServerStep(String jobToken, List<Integer> stepPosition, File filesDir, SimpleLogger logger);
+ Map<String, byte[]> runServerStep(String jobToken, List<Integer> stepPosition,
+ File filesDir, Map<String, String> placeholderValues, SimpleLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
index 709be3ded6..d2e745f0ee 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java
@@ -1,5 +1,8 @@
package io.onedev.server.buildspec.job;
+import static io.onedev.k8shelper.KubernetesHelper.*;
+
+import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.model.Build;
public enum JobVariable {
@@ -64,7 +67,10 @@ public enum JobVariable {
@Override
public String getValue(Build build) {
- return build.getVersion();
+ if (build.getVersion() != null)
+ return build.getVersion();
+ else
+ return PLACEHOLDER_PREFIX + KubernetesHelper.BUILD_VERSION + PLACEHOLDER_SUFFIX;
}
},
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 7fce24474e..0a548795e0 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
@@ -101,7 +101,7 @@ public class ProjectDependency implements Serializable {
return new ArrayList<>();
}
- @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into repository root")
+ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(suggester="suggestArtifacts", path=true)
@NotEmpty
@@ -115,7 +115,7 @@ public class ProjectDependency implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
@SuppressWarnings("unused")
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 565bcbe978..bdb16fec77 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
@@ -65,7 +65,7 @@ public class CreateIssueAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, false);
}
@Editable(order=1100, group="Issue Detail")
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 61fb1dbe88..080c3df644 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
@@ -28,6 +28,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
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.editable.annotation.VariableOption;
import io.onedev.server.web.util.WicketUtils;
@Editable(name="Run job", order=100)
@@ -57,6 +58,7 @@ public class RunJobAction extends PostBuildAction {
@Editable(name="Job Parameters", order=1000)
@ParamSpecProvider("getParamSpecs")
+ @VariableOption(withBuildVersion=true, withFile=false)
@OmitName
@Valid
public List<ParamSupply> getJobParams() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index b5304496a9..d06f96b6c1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -25,6 +25,7 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.VariableOption;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@@ -58,6 +59,7 @@ public abstract class JobTrigger implements Serializable {
@Editable(name="Job Parameters", order=1000)
@ParamSpecProvider("getParamSpecs")
+ @VariableOption(withBuildVersion=false, withFile=false)
@OmitName
@Valid
public List<ParamSupply> getParams() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
new file mode 100644
index 0000000000..2e89ebd609
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
@@ -0,0 +1,49 @@
+package io.onedev.server.buildspec.step;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.k8shelper.CheckoutExecutable;
+import io.onedev.k8shelper.Executable;
+import io.onedev.server.buildspec.job.gitcredential.DefaultCredential;
+import io.onedev.server.buildspec.job.gitcredential.GitCredential;
+import io.onedev.server.buildspec.param.ParamCombination;
+import io.onedev.server.model.Build;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=5, name="Checkout Code")
+public class CheckoutStep extends Step {
+
+ private static final long serialVersionUID = 1L;
+
+ private GitCredential cloneCredential = new DefaultCredential();
+
+ private Integer cloneDepth;
+
+ @Editable(order=100, description="By default code is cloned via an auto-generated credential, "
+ + "which only has read permission over current project. In case the job needs to <a href='$docRoot/pages/push-in-job.md' target='_blank'>push code to server</a>, or want "
+ + "to <a href='$docRoot/pages/clone-submodules-via-ssh.md' target='_blank'>clone private submodules</a>, you should supply custom credential with appropriate permissions here")
+ @NotNull
+ public GitCredential getCloneCredential() {
+ return cloneCredential;
+ }
+
+ public void setCloneCredential(GitCredential cloneCredential) {
+ this.cloneCredential = cloneCredential;
+ }
+
+ @Editable(order=200, description="Optionally specify depth for a shallow clone in order "
+ + "to speed up source retrieval")
+ public Integer getCloneDepth() {
+ return cloneDepth;
+ }
+
+ public void setCloneDepth(Integer cloneDepth) {
+ this.cloneDepth = cloneDepth;
+ }
+
+ @Override
+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
+ return new CheckoutExecutable(cloneDepth!=null?cloneDepth:0, cloneCredential.newCloneInfo(build, jobToken));
+ }
+
+}
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/step/CloseMilestoneStep.java
similarity index 73%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java
rename to server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
index 74e5767103..abde01ebea 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/step/CloseMilestoneStep.java
@@ -1,6 +1,8 @@
-package io.onedev.server.buildspec.job.action;
+package io.onedev.server.buildspec.step;
+import java.io.File;
import java.util.List;
+import java.util.Map;
import org.hibernate.validator.constraints.NotEmpty;
@@ -13,11 +15,12 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(name="Close milestone", order=500)
-public class CloseMilestoneAction extends PostBuildAction {
+@Editable(name="Close Milestone", order=40)
+public class CloseMilestoneStep extends ServerStep {
private static final long serialVersionUID = 1L;
@@ -36,11 +39,11 @@ public class CloseMilestoneAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void execute(Build build) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
OneDev.getInstance(TransactionManager.class).run(new Runnable() {
@Override
@@ -50,13 +53,11 @@ public class CloseMilestoneAction extends PostBuildAction {
MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);
Milestone milestone = milestoneManager.find(project, milestoneName);
if (milestone != null) {
- CloseMilestoneAction instance = new CloseMilestoneAction();
- instance.setMilestoneName(getMilestoneName());
- if (project.getBuildSetting().isActionAuthorized(build, instance)) {
+ if (build.canCloseMilestone(milestoneName)) {
milestone.setClosed(true);
milestoneManager.save(milestone);
} else {
- throw new ExplicitException("Closing milestone '" + milestoneName + "' is not allowed in this build");
+ throw new ExplicitException("This build is not authorized to close milestone '" + milestoneName + "'");
}
} else {
throw new ExplicitException("Unable to find milestone '" + milestoneName + "'");
@@ -64,11 +65,7 @@ public class CloseMilestoneAction extends PostBuildAction {
}
});
- }
-
- @Override
- public String getDescription() {
- return "Close milestone";
+ 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
index 9a8e739bee..2db073401f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -5,7 +5,6 @@ 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;
@@ -13,17 +12,12 @@ import io.onedev.k8shelper.CommandExecutable;
import io.onedev.k8shelper.Executable;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
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")
+@Editable(order=10, name="Execute Shell/Batch Commands")
public class CommandStep extends Step {
private static final long serialVersionUID = 1L;
@@ -44,9 +38,9 @@ public class CommandStep extends Step {
}
@Editable(order=110, description="Specify content of Linux shell script or Windows command batch to execute "
- + "under the repository root")
+ + "under the <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
@Interpolative
- @Code(language = Code.SHELL, variableProvider="getVariables")
+ @Code(language=Code.SHELL, variableProvider="suggestCommandVariables")
@Size(min=1, message="may not be empty")
public List<String> getCommands() {
return commands;
@@ -58,24 +52,16 @@ public class CommandStep extends Step {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, false, false);
}
@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();
- for (InputSuggestion suggestion: SuggestionUtils
- .suggestVariables(project, BuildSpec.get(), ParamSpec.list(), "")) {
- variables.add(suggestion.getContent());
- }
- return variables;
+ private static List<InputSuggestion> suggestCommandVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
-
+
@Override
- public Executable getExecutable(Build build, ParamCombination paramCombination) {
+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
return new CommandExecutable(getImage(), getCommands());
}
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/step/CreateTagStep.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java
rename to server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
index 246df583a6..b54715e0fb 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/step/CreateTagStep.java
@@ -1,6 +1,8 @@
-package io.onedev.server.buildspec.job.action;
+package io.onedev.server.buildspec.step;
+import java.io.File;
import java.util.List;
+import java.util.Map;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
@@ -14,12 +16,13 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Multiline;
-@Editable(name="Create tag", order=400)
-public class CreateTagAction extends PostBuildAction {
+@Editable(name="Create Tag", order=30)
+public class CreateTagStep extends ServerStep {
private static final long serialVersionUID = 1L;
@@ -51,18 +54,16 @@ public class CreateTagAction extends PostBuildAction {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void execute(Build build) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
PersonIdent tagIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();
Project project = build.getProject();
String tagName = getTagName();
- CreateTagAction instance = new CreateTagAction();
- instance.setTagName(tagName);
- if (project.getBuildSetting().isActionAuthorized(build, instance)) {
+ if (build.canCreateTag(tagName)) {
Ref tagRef = project.getTagRef(tagName);
if (tagRef != null) {
OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);
@@ -71,13 +72,10 @@ public class CreateTagAction extends PostBuildAction {
project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());
}
} else {
- throw new ExplicitException("Creating tag '" + tagName + "' is not allowed in this build");
+ throw new ExplicitException("This build is not authorized to create tag '" + tagName + "'");
}
- }
-
- @Override
- public String getDescription() {
- return "Create tag";
+
+ return null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
index e0d418f03c..b2ae02679f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
@@ -2,6 +2,7 @@ package io.onedev.server.buildspec.step;
import java.io.File;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.hibernate.validator.constraints.NotEmpty;
@@ -25,7 +26,7 @@ public class PublishArtifactStep extends ServerStep {
private String artifacts;
@Editable(order=100, description="Specify files to publish as job artifacts relative to "
- + "repository root. Use * or ? for pattern match")
+ + "<a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. Use * or ? for pattern match")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@NotEmpty
@@ -39,7 +40,7 @@ public class PublishArtifactStep extends ServerStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
@@ -48,7 +49,7 @@ public class PublishArtifactStep extends ServerStep {
}
@Override
- public void run(Build build, File filesDir, SimpleLogger jobLogger) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger jobLogger) {
LockUtils.write(build.getArtifactsLockKey(), new Callable<Void>() {
@Override
@@ -60,6 +61,7 @@ public class PublishArtifactStep extends ServerStep {
}
});
+ return null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
index b03ce7d8b6..68e80fce1d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
@@ -5,6 +5,7 @@ import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.k8shelper.ExecuteCondition;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.validation.annotation.PathSegment;
@@ -34,12 +35,16 @@ public abstract class PublishReportStep extends ServerStep {
this.reportName = reportName;
}
+ public PublishReportStep() {
+ setCondition(ExecuteCondition.ALWAYS);
+ }
+
@Override
protected PatternSet getFiles() {
return PatternSet.parse(getFilePatterns());
}
- @Editable(order=100, description="Specify files relative to repository root to publish. Use * or ? for pattern match")
+ @Editable(order=100, description="Specify files relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a> to publish. Use * or ? for pattern match")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@NotEmpty
@@ -53,7 +58,7 @@ public abstract class PublishReportStep extends ServerStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
public PatternSet getPatternSet() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
index b9dd1aa314..04706d9c04 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
@@ -1,29 +1,51 @@
package io.onedev.server.buildspec.step;
import java.io.File;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
import io.onedev.k8shelper.Executable;
+import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.k8shelper.ServerExecutable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.EditableStringVisitor;
+import io.onedev.server.web.editable.annotation.Interpolative;
public abstract class ServerStep extends Step {
private static final long serialVersionUID = 1L;
@Override
- public Executable getExecutable(Build build, ParamCombination paramCombination) {
- PatternSet files = getFiles();
- return new ServerExecutable(this, files.getIncludes(), files.getExcludes());
+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
+ return new ServerExecutable(this, getFiles().getIncludes(), getFiles().getExcludes(), getPlaceholders());
}
protected PatternSet getFiles() {
return new PatternSet(new HashSet<>(), new HashSet<>());
}
- public abstract void run(Build build, File filesDir, SimpleLogger logger);
+ @Nullable
+ public abstract Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger);
+ public Collection<String> getPlaceholders() {
+ Collection<String> placeholders = new HashSet<>();
+
+ new EditableStringVisitor(new Consumer<String>() {
+
+ @Override
+ public void accept(String t) {
+ placeholders.addAll(KubernetesHelper.parsePlaceholders(t));
+ }
+
+ }).visitProperties(this, Interpolative.class);
+
+ return placeholders;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java
new file mode 100644
index 0000000000..9aae16b23d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java
@@ -0,0 +1,65 @@
+package io.onedev.server.buildspec.step;
+
+import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.event.build.BuildUpdated;
+import io.onedev.server.model.Build;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.util.SimpleLogger;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Interpolative;
+
+@Editable(order=20, name="Set Build Version")
+public class SetBuildVersionStep extends ServerStep {
+
+ private static final long serialVersionUID = 1L;
+
+ private String buildVersion;
+
+ @Editable(order=100)
+ @Interpolative(variableSuggester="suggestVariables")
+ @NotEmpty
+ public String getBuildVersion() {
+ return buildVersion;
+ }
+
+ public void setBuildVersion(String buildVersion) {
+ this.buildVersion = buildVersion;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestVariables(String matchWith) {
+ return BuildSpec.suggestVariables(matchWith, false, true);
+ }
+
+ @Override
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger jobLogger) {
+ return OneDev.getInstance(TransactionManager.class).call(new Callable<Map<String, byte[]>>() {
+
+ @Override
+ public Map<String, byte[]> call() {
+ build.setVersion(buildVersion);
+ OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(build));
+ Map<String, byte[]> outputFiles = new HashMap<>();
+ outputFiles.put(BUILD_VERSION, buildVersion.getBytes(StandardCharsets.UTF_8));
+ return outputFiles;
+ }
+
+ });
+
+ }
+
+}
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
index 49cbbaf737..abf92f46a6 100644
--- 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
@@ -4,6 +4,8 @@ import java.io.Serializable;
import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.NotEmpty;
+
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.Executable;
import io.onedev.k8shelper.ExecuteCondition;
@@ -18,7 +20,19 @@ public abstract class Step implements Serializable {
private ExecuteCondition condition = ExecuteCondition.ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL;
- public abstract Executable getExecutable(Build build, ParamCombination paramCombination);
+ public abstract Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination);
+
+ private String name;
+
+ @Editable(order=10)
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
@Editable(order=10000, description="Under which condition this step should run")
@NotNull
@@ -30,8 +44,12 @@ public abstract class Step implements Serializable {
this.condition = condition;
}
- public Action getAction(Build build, ParamCombination paramCombination) {
- return new Action(getExecutable(build, paramCombination), condition);
+ public Action getAction(String name, Build build, String jobToken, ParamCombination paramCombination) {
+ return new Action(name, getExecutable(build, jobToken, paramCombination), condition);
+ }
+
+ public Action getAction(Build build, String jobToken, ParamCombination paramCombination) {
+ return getAction(name, build, jobToken, paramCombination);
}
}
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
index 4f0cbece3e..e6f4960caf 100644
--- 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
@@ -30,10 +30,6 @@ public class StepTemplate implements NamedElement, Serializable {
private List<ParamSpec> paramSpecs = new ArrayList<>();
- public StepTemplate() {
- steps.add(new CommandStep());
- }
-
@Editable(order=100)
@SuggestionProvider("getNameSuggestions")
@NotEmpty
@@ -57,7 +53,7 @@ public class StepTemplate implements NamedElement, Serializable {
return new ArrayList<>();
}
- @Editable(order=200, name="Steps to Execute")
+ @Editable(order=200, description="Steps will be executed serially on same node, sharing the same <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
@Size(min=1, max=1000, message="At least one step needs to be defined")
public List<Step> getSteps() {
return steps;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
index 0d16ee2b9a..4ca6861b2c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
@@ -3,6 +3,7 @@ package io.onedev.server.buildspec.step;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.validation.Valid;
@@ -27,6 +28,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
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.editable.annotation.VariableOption;
@Editable(order=10000, name="Use Step Template", description="Step to use specified template")
public class UseTemplateStep extends Step {
@@ -63,6 +65,7 @@ public class UseTemplateStep extends Step {
@Editable(name="Step Parameters", order=200)
@ParamSpecProvider("getParamSpecs")
+ @VariableOption(withBuildVersion=true, withFile=true)
@OmitName
@Valid
public List<ParamSupply> getParams() {
@@ -86,23 +89,26 @@ public class UseTemplateStep extends Step {
}
@Override
- public Executable getExecutable(Build build, ParamCombination paramCombination) {
+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
StepTemplate template = build.getSpec().getStepTemplateMap().get(templateName);
if (template == null)
throw new ExplicitException("Step template not found: " + templateName);
List<Action> actions = new ArrayList<>();
+ AtomicInteger repeatRef = new AtomicInteger(0);
new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, paramCombination, getParams())) {
@Override
public void run(Map<String, List<String>> paramMap) {
+ int repeat = repeatRef.incrementAndGet();
ParamUtils.validateParamMap(template.getParamSpecs(), paramMap);
ParamCombination newParamCombination = new ParamCombination(template.getParamSpecs(), paramMap);
VariableInterpolator interpolator = new VariableInterpolator(build, newParamCombination);
for (Step step: template.getSteps()) {
step = interpolator.interpolateProperties(step);
- actions.add(step.getAction(build, newParamCombination));
+ String actionName = step.getName() + " (" + repeat + ")";
+ actions.add(step.getAction(actionName, build, jobToken, newParamCombination));
}
}
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 181dbc4656..fab5ecaef7 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
@@ -72,6 +72,9 @@ import io.onedev.server.git.RefInfo;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.support.BuildMetric;
import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
+import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;
+import io.onedev.server.model.support.build.actionauthorization.CreateTagAuthorization;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.storage.StorageManager;
@@ -85,6 +88,7 @@ import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.BuildFacade;
import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
@@ -876,6 +880,34 @@ public class Build extends AbstractEntity implements Referenceable {
ScriptIdentity.pop();
}
+ public boolean canCreateTag(String tagName) {
+ for (ActionAuthorization authorization: getProject().getBuildSetting().getActionAuthorizations()) {
+ if (isOnBranches(authorization.getAuthorizedBranches())) {
+ if (authorization instanceof CreateTagAuthorization) {
+ CreateTagAuthorization createTagAuthorization = (CreateTagAuthorization) authorization;
+ String tagNames = createTagAuthorization.getTagNames();
+ if (tagNames == null || WildcardUtils.matchPath(tagNames, tagName))
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean canCloseMilestone(String milestoneName) {
+ for (ActionAuthorization authorization: getProject().getBuildSetting().getActionAuthorizations()) {
+ if (isOnBranches(authorization.getAuthorizedBranches())) {
+ if (authorization instanceof CloseMilestoneAuthorization) {
+ CloseMilestoneAuthorization closeMilestoneAuthorization = (CloseMilestoneAuthorization) authorization;
+ String milestoneNames = closeMilestoneAuthorization.getMilestoneNames();
+ if (milestoneNames == null || WildcardUtils.matchPath(milestoneNames, milestoneName))
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
public boolean isValid() {
try {
return getProject().getRepository().getObjectDatabase().has(ObjectId.fromString(getCommitHash()));
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
index a0cc549d37..2eb3b1d9be 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
@@ -12,9 +12,7 @@ import java.util.Set;
import javax.annotation.Nullable;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
@@ -125,15 +123,6 @@ public class ProjectBuildSetting implements Serializable {
return null;
}
- public boolean isActionAuthorized(Build build, PostBuildAction action) {
- List<ActionAuthorization> authorizations = getActionAuthorizations();
- for (ActionAuthorization authorization: authorizations) {
- if (authorization.matches(action) && build.isOnBranches(authorization.getAuthorizedBranches()))
- return true;
- }
- return false;
- }
-
@Nullable
public String getDefaultFixedIssueQuery(String jobName) {
Matcher matcher = new StringMatcher();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
index 3e8499ae26..2316e0c911 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.model.Project;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -42,8 +41,6 @@ public abstract class ActionAuthorization implements Serializable {
return new ArrayList<>();
}
- public abstract boolean matches(PostBuildAction postBuildAction);
-
public abstract String getActionDescription();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
index 3912fdf8ba..dcf788aa4a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
@@ -4,10 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.buildspec.job.action.CloseMilestoneAction;
-import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -40,16 +37,6 @@ public class CloseMilestoneAuthorization extends ActionAuthorization {
return new ArrayList<>();
}
- @Override
- public boolean matches(PostBuildAction postBuildAction) {
- if (postBuildAction instanceof CloseMilestoneAction) {
- CloseMilestoneAction closeMilestoneAction = (CloseMilestoneAction) postBuildAction;
- return milestoneNames == null || WildcardUtils.matchPath(milestoneNames, closeMilestoneAction.getMilestoneName());
- } else {
- return false;
- }
- }
-
@Override
public String getActionDescription() {
if (milestoneNames != null)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
index 364788680f..8aa4b17f95 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
@@ -4,16 +4,13 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.buildspec.job.action.CreateTagAction;
-import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
-@Editable(order=100, name="Create tag")
+@Editable(order=20, name="Create tag")
public class CreateTagAuthorization extends ActionAuthorization {
private static final long serialVersionUID = 1L;
@@ -40,16 +37,6 @@ public class CreateTagAuthorization extends ActionAuthorization {
return new ArrayList<>();
}
- @Override
- public boolean matches(PostBuildAction postBuildAction) {
- if (postBuildAction instanceof CreateTagAction) {
- CreateTagAction createTagAction = (CreateTagAction) postBuildAction;
- return tagNames == null || WildcardUtils.matchPath(tagNames, createTagAction.getTagName());
- } else {
- return false;
- }
- }
-
@Override
public String getActionDescription() {
if (tagNames != null)
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
index 516217e8d9..b47737be91 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
@@ -1,8 +1,5 @@
package io.onedev.server.util.interpolative;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -19,25 +16,30 @@ import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.model.Build;
-import io.onedev.server.util.BeanUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.interpolative.Interpolative.Segment;
import io.onedev.server.util.interpolative.Interpolative.Segment.Type;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.EditableStringTransformer;
+
+import static io.onedev.k8shelper.KubernetesHelper.*;
public class VariableInterpolator {
public static final String HELP = "<b>NOTE: </b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>. "
+ "Use <tt>@@</tt> for literal <tt>@</tt>";
- public static final String PREFIX_PARAMS = "params:";
+ public static final String PREFIX_PARAM = "param:";
+
+ public static final String PREFIX_PROPERTY = "property:";
- public static final String PREFIX_PROPERTIES = "properties:";
+ public static final String PREFIX_SECRET = "secret:";
- public static final String PREFIX_SECRETS = "secrets:";
+ public static final String PREFIX_SCRIPT = "script:";
- public static final String PREFIX_SCRIPTS = "scripts:";
+ public static final String PREFIX_FILE = "file:";
+
+ private final EditableStringTransformer beanPropertyTransformer;
private final Function<String, String> variableResolver;
@@ -52,8 +54,13 @@ public class VariableInterpolator {
return value!=null?value:"";
}
}
- if (t.startsWith(PREFIX_PARAMS)) {
- String paramName = t.substring(PREFIX_PARAMS.length());
+ if (t.startsWith(PREFIX_PARAM) || t.startsWith("params:")) {
+ String paramName;
+ if (t.startsWith(PREFIX_PARAM))
+ paramName = t.substring(PREFIX_PARAM.length());
+ else
+ paramName = t.substring("params:".length());
+
for (Entry<String, Input> entry: paramCombination.getParamInputs().entrySet()) {
if (paramName.equals(entry.getKey())) {
if (paramCombination.isParamVisible(paramName)) {
@@ -71,18 +78,32 @@ public class VariableInterpolator {
}
}
throw new ExplicitException("Undefined param: " + paramName);
- } else if (t.startsWith(PREFIX_PROPERTIES)) {
- String propertyName = t.substring(PREFIX_PROPERTIES.length());
+ } else if (t.startsWith(PREFIX_PROPERTY) || t.startsWith("properties:")) {
+ String propertyName;
+ if (t.startsWith(PREFIX_PROPERTY))
+ propertyName = t.substring(PREFIX_PROPERTY.length());
+ else
+ propertyName = t.substring("properties:".length());
+
Property property = build.getSpec().getPropertyMap().get(propertyName);
if (property != null)
return property.getValue();
else
throw new ExplicitException("Undefined property: " + propertyName);
- } else if (t.startsWith(PREFIX_SECRETS)) {
- String secretName = t.substring(PREFIX_SECRETS.length());
+ } else if (t.startsWith(PREFIX_SECRET) || t.startsWith("secrets:")) {
+ String secretName;
+ if (t.startsWith(PREFIX_SECRET))
+ secretName = t.substring(PREFIX_SECRET.length());
+ else
+ secretName = t.substring("secrets:".length());
return build.getSecretValue(secretName);
- } else if (t.startsWith(PREFIX_SCRIPTS)) {
- String scriptName = t.substring(PREFIX_SCRIPTS.length());
+ } else if (t.startsWith(PREFIX_SCRIPT) || t.startsWith("scripts:")) {
+ String scriptName;
+ if (t.startsWith(PREFIX_SCRIPT))
+ scriptName = t.substring(PREFIX_SCRIPT.length());
+ else
+ scriptName = t.substring("scripts:".length());
+
Map<String, Object> context = new HashMap<>();
context.put("build", build);
Object result = GroovyUtils.evalScriptByName(scriptName, context);
@@ -90,6 +111,8 @@ public class VariableInterpolator {
return result.toString();
else
return "";
+ } else if (t.startsWith(PREFIX_FILE)) {
+ return PLACEHOLDER_PREFIX + WORKSPACE + "/" + t.substring(PREFIX_FILE.length()) + PLACEHOLDER_SUFFIX;
} else {
throw new ExplicitException("Unrecognized interpolation variable: " + t);
}
@@ -100,6 +123,14 @@ public class VariableInterpolator {
public VariableInterpolator(Function<String, String> variableResolver) {
this.variableResolver = variableResolver;
+ beanPropertyTransformer = new EditableStringTransformer(new Function<String, String>() {
+
+ @Override
+ public String apply(String t) {
+ return interpolate(t);
+ }
+
+ });
}
public VariableInterpolator(Build build) {
@@ -125,82 +156,10 @@ public class VariableInterpolator {
}
}
- @SuppressWarnings("unchecked")
public <T> T interpolateProperties(T object) {
- Class<T> clazz = (Class<T>) object.getClass();
-
- T interpolated;
- try {
- interpolated = clazz.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
-
- for (Field field: BeanUtils.findFields(clazz)) {
- field.setAccessible(true);
- try {
- field.set(interpolated, field.get(object));
- } catch (IllegalArgumentException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- }
-
- for (Method getter: BeanUtils.findGetters(clazz)) {
- if (getter.getAnnotation(Editable.class) != null) {
- Method setter = BeanUtils.findSetter(getter);
- if (setter != null) {
- try {
- Object propertyValue = getter.invoke(interpolated);
- if (propertyValue != null) {
- Class<?> propertyClass = propertyValue.getClass();
- if (getter.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {
- try {
- if (propertyValue instanceof String) {
- setter.invoke(interpolated, interpolate((String) propertyValue));
- } else if (propertyValue instanceof List) {
- List<Object> interpolatedList = new ArrayList<>();
- for (Object element: (List<String>) propertyValue) {
- if (element == null) {
- interpolatedList.add(element);
- } else if (element instanceof String) {
- interpolatedList.add(interpolate((String) element));
- } else if (element instanceof List) {
- List<String> interpolatedList2 = new ArrayList<>();
- for (String element2: (List<String>) element)
- interpolatedList2.add(interpolate(element2));
- interpolatedList.add(interpolatedList2);
- } else {
- throw new RuntimeException("Unexpected list element type: " + element.getClass());
- }
- }
- setter.invoke(interpolated, interpolatedList);
- }
- } catch (Exception e) {
- String message = String.format("Error interpolating (class: %s, property: %s)",
- propertyClass, BeanUtils.getPropertyName(getter));
- throw new RuntimeException(message, e);
- }
- } else if (propertyClass.getAnnotation(Editable.class) != null) {
- setter.invoke(interpolated, interpolateProperties(propertyValue));
- } else if (propertyValue instanceof List) {
- List<Object> interpolatedList = new ArrayList<>();
- for (Object element: (List<?>)propertyValue) {
- if (element != null && element.getClass().getAnnotation(Editable.class) != null)
- interpolatedList.add(interpolateProperties(element));
- else
- interpolatedList.add(element);
- }
- setter.invoke(interpolated, interpolatedList);
- }
- }
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
- }
- }
- }
-
- return interpolated;
+ return beanPropertyTransformer.transformProperties(
+ object,
+ io.onedev.server.web.editable.annotation.Interpolative.class);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/EnvironmentNameValidator.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
rename to server-core/src/main/java/io/onedev/server/util/validation/EnvironmentNameValidator.java
index f08a273299..4e54c0b013 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/EnvironmentNameValidator.java
@@ -4,14 +4,14 @@ import javax.lang.model.SourceVersion;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import io.onedev.server.util.validation.annotation.VariableName;
+import io.onedev.server.util.validation.annotation.EnvironmentName;
-public class VariableNameValidator implements ConstraintValidator<VariableName, String> {
+public class EnvironmentNameValidator implements ConstraintValidator<EnvironmentName, String> {
private String message;
@Override
- public void initialize(VariableName constaintAnnotation) {
+ public void initialize(EnvironmentName constaintAnnotation) {
message = constaintAnnotation.message();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/EnvironmentName.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java
rename to server-core/src/main/java/io/onedev/server/util/validation/annotation/EnvironmentName.java
index e2ff81c5bf..55e1618870 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/EnvironmentName.java
@@ -8,12 +8,12 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-import io.onedev.server.util.validation.VariableNameValidator;
+import io.onedev.server.util.validation.EnvironmentNameValidator;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=VariableNameValidator.class)
-public @interface VariableName {
+@Constraint(validatedBy=EnvironmentNameValidator.class)
+public @interface EnvironmentName {
String message() default "name should start with letter and can only consist of "
+ "alphanumeric and underscore characters";
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
index 6da1d6e161..d93fec106d 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css
@@ -57,4 +57,7 @@
}
.CodeMirror-fullscreen {
z-index: 210;
+}
+.CodeMirror-hints {
+ z-index: 10000;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js
index 922c926438..14b57675ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js
@@ -11,6 +11,7 @@ onedev.server.modal = {
&& $("body>.floating").length == 0
&& $(".sp-container:visible").length == 0
&& $(".atwho-view:visible").length == 0
+ && $(".CodeMirror-hints:visible").length == 0
&& $(".flatpickr-calendar.open").length == 0
&& $modal.nextAll(".modal").length == 0
&& !$("body").hasClass("fullscreen")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java
new file mode 100644
index 0000000000..3d2c1c5de0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java
@@ -0,0 +1,104 @@
+package io.onedev.server.web.editable;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+import io.onedev.server.util.BeanUtils;
+import io.onedev.server.web.editable.annotation.Editable;
+
+public class EditableStringTransformer {
+
+ private final Function<String, String> transformer;
+
+ public EditableStringTransformer(Function<String, String> transformer) {
+ this.transformer = transformer;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T transformProperties(T object, Class<? extends Annotation> transformativeMarker) {
+ Class<T> clazz = (Class<T>) object.getClass();
+
+ T transformed;
+ try {
+ transformed = clazz.newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+
+ for (Field field: BeanUtils.findFields(clazz)) {
+ field.setAccessible(true);
+ try {
+ field.set(transformed, field.get(object));
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ for (Method getter: BeanUtils.findGetters(clazz)) {
+ if (getter.getAnnotation(Editable.class) != null) {
+ Method setter = BeanUtils.findSetter(getter);
+ if (setter != null) {
+ try {
+ Object propertyValue = getter.invoke(transformed);
+ if (propertyValue != null) {
+ Class<?> propertyClass = propertyValue.getClass();
+ if (getter.getAnnotation(transformativeMarker) != null) {
+ try {
+ if (propertyValue instanceof String) {
+ setter.invoke(transformed, transformer.apply((String) propertyValue));
+ } else if (propertyValue instanceof List) {
+ List<Object> transformedList = new ArrayList<>();
+ for (Object element: (List<String>) propertyValue) {
+ if (element == null) {
+ transformedList.add(element);
+ } else if (element instanceof String) {
+ transformedList.add(transformer.apply((String) element));
+ } else if (element instanceof List) {
+ List<String> transformedList2 = new ArrayList<>();
+ for (String element2: (List<String>) element) {
+ if (element2 != null)
+ transformedList2.add(transformer.apply((String) element2));
+ else
+ transformedList2.add(element2);
+ }
+ transformedList.add(transformedList2);
+ } else {
+ throw new RuntimeException("Unexpected list element type: " + element.getClass());
+ }
+ }
+ setter.invoke(transformed, transformedList);
+ }
+ } catch (Exception e) {
+ String message = String.format("Error transforming (class: %s, property: %s)",
+ propertyClass, BeanUtils.getPropertyName(getter));
+ throw new RuntimeException(message, e);
+ }
+ } else if (propertyClass.getAnnotation(Editable.class) != null) {
+ setter.invoke(transformed, transformProperties(propertyValue, transformativeMarker));
+ } else if (propertyValue instanceof List) {
+ List<Object> transformedList = new ArrayList<>();
+ for (Object element: (List<?>)propertyValue) {
+ if (element != null && element.getClass().getAnnotation(Editable.class) != null)
+ transformedList.add(transformProperties(element, transformativeMarker));
+ else
+ transformedList.add(element);
+ }
+ setter.invoke(transformed, transformedList);
+ }
+ }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ return transformed;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableStringVisitor.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringVisitor.java
new file mode 100644
index 0000000000..870802bc00
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringVisitor.java
@@ -0,0 +1,67 @@
+package io.onedev.server.web.editable;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.function.Consumer;
+
+import io.onedev.server.util.BeanUtils;
+import io.onedev.server.web.editable.annotation.Editable;
+
+public class EditableStringVisitor {
+
+ private final Consumer<String> consumer;
+
+ public EditableStringVisitor(Consumer<String> consumer) {
+ this.consumer = consumer;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void visitProperties(Object object, Class<? extends Annotation> visitableMarker) {
+ for (Method getter: BeanUtils.findGetters(object.getClass())) {
+ if (getter.getAnnotation(Editable.class) != null && BeanUtils.findSetter(getter) != null) {
+ try {
+ Object propertyValue = getter.invoke(object);
+ if (propertyValue != null) {
+ Class<?> propertyClass = propertyValue.getClass();
+ if (getter.getAnnotation(visitableMarker) != null) {
+ try {
+ if (propertyValue instanceof String) {
+ consumer.accept((String) propertyValue);
+ } else if (propertyValue instanceof List) {
+ for (Object element: (List<String>) propertyValue) {
+ if (element instanceof String) {
+ consumer.accept((String) element);
+ } else if (element instanceof List) {
+ for (String element2: (List<String>) element) {
+ if (element2 != null)
+ consumer.accept((String) element2);
+ }
+ } else {
+ throw new RuntimeException("Unexpected list element type: " + element.getClass());
+ }
+ }
+ }
+ } catch (Exception e) {
+ String message = String.format("Error visiting (class: %s, property: %s)",
+ propertyClass, BeanUtils.getPropertyName(getter));
+ throw new RuntimeException(message, e);
+ }
+ } else if (propertyClass.getAnnotation(Editable.class) != null) {
+ visitProperties(propertyValue, visitableMarker);
+ } else if (propertyValue instanceof List) {
+ for (Object element: (List<?>)propertyValue) {
+ if (element != null && element.getClass().getAnnotation(Editable.class) != null)
+ visitProperties(element, visitableMarker);
+ }
+ }
+ }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index bfb4268138..364337bdb3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -87,7 +87,7 @@ public class EditableUtils {
}
return StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());
} else if (editable.description().length() != 0) {
- return editable.description();
+ return StringUtils.replace(editable.description(), "$docRoot", OneDev.getInstance().getDocRoot());
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/VariableOption.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/VariableOption.java
new file mode 100644
index 0000000000..caa90dc322
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/VariableOption.java
@@ -0,0 +1,14 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface VariableOption {
+ boolean withBuildVersion();
+
+ boolean withFile();
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
index ca6b17286a..c363cb1d74 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.html
@@ -4,7 +4,7 @@
<table wicket:id="dependencies"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
index add0eb2d28..5d3521f666 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
@@ -14,7 +14,6 @@ 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;
@@ -28,7 +27,6 @@ import io.onedev.server.buildspec.job.JobDependency;
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;
import io.onedev.server.web.util.TextUtils;
@@ -54,73 +52,64 @@ class JobDependencyListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getJobName());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
}
+
});
columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getJobParams().size());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
}
+
});
columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Require Successful")) {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- JobDependency dependency = rowModel.getObject();
- return new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful()));
- }
-
- });
+ JobDependency dependency = rowModel.getObject();
+ cellItem.add(new Label(componentId, TextUtils.describe(dependency.isRequireSuccessful())));
}
+
});
columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+ int dependencyIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", JobDependencyListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- if (!rowModel.getObject().getJobParams().isEmpty()) {
- return new SpriteImage(componentId, "ellipsis") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
- }
-
- };
- } else {
- return new Label(componentId);
- }
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Job Dependency");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "job-dependency"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, dependencies.get(dependencyIndex));
+ }
+
+ };
}
});
+
+ cellItem.add(fragment);
}
@Override
@@ -128,7 +117,7 @@ class JobDependencyListViewPanel extends Panel {
return "ellipsis text-right";
}
- });
+ });
IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {
@@ -152,49 +141,5 @@ class JobDependencyListViewPanel extends Panel {
});
}
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", JobDependencyListViewPanel.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, "Job Dependency");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "job-dependency"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, dependencies.get(index));
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
index 6c6eb2df26..840ecbf601 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.html
@@ -4,7 +4,7 @@
<table wicket:id="actions"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/job/postbuildaction/PostBuildActionListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
index 0e1502a2ee..c9166fefab 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
@@ -14,7 +14,6 @@ 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;
@@ -28,7 +27,6 @@ import io.onedev.server.buildspec.job.action.PostBuildAction;
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;
import io.onedev.server.web.editable.EditableUtils;
@@ -54,53 +52,55 @@ class PostBuildActionListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getDescription());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getDescription()));
}
+
});
columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("Condition")) {
@Override
public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getCondition());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getCondition()));
}
+
});
columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+ int actionIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", PostBuildActionListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String actionType = EditableUtils.getDisplayName(actions.get(actionIndex).getClass());
+ return new Label(componentId, "Post Build Action (type: " + actionType + ")");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "post-build-action"));
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected Component newBody(String id) {
+ return BeanContext.view(id, actions.get(actionIndex));
}
-
+
};
}
});
+
+ cellItem.add(fragment);
}
@Override
@@ -108,7 +108,7 @@ class PostBuildActionListViewPanel extends Panel {
return "ellipsis text-right";
}
- });
+ });
IDataProvider<PostBuildAction> dataProvider = new ListDataProvider<PostBuildAction>() {
@@ -132,49 +132,4 @@ class PostBuildActionListViewPanel extends Panel {
});
}
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", PostBuildActionListViewPanel.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, "Popst Build Action (type: " + EditableUtils.getDisplayName(actions.get(index).getClass()) + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "post-build-action"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, actions.get(index));
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
index ca6b17286a..c363cb1d74 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.html
@@ -4,7 +4,7 @@
<table wicket:id="dependencies"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
index 125ec60449..a4e3db75ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
@@ -14,7 +14,6 @@ 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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -29,8 +28,7 @@ import org.apache.wicket.model.Model;
import io.onedev.server.buildspec.job.ProjectDependency;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;
-import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
import io.onedev.server.web.editable.BeanContext;
@SuppressWarnings("serial")
@@ -55,54 +53,54 @@ class ProjectDependencyListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getProjectName());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getProjectName()));
}
+
});
columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Build")) {
@Override
public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getBuildNumber());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getBuildNumber()));
}
+
});
columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+ int dependencyIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", ProjectDependencyListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Project Dependency");
}
-
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "project-dependency"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, dependencies.get(dependencyIndex));
+ }
+
};
}
});
+ cellItem.add(fragment);
}
@Override
@@ -110,7 +108,7 @@ class ProjectDependencyListViewPanel extends Panel {
return "ellipsis text-right";
}
- });
+ });
IDataProvider<ProjectDependency> dataProvider = new ListDataProvider<ProjectDependency>() {
@@ -134,51 +132,6 @@ class ProjectDependencyListViewPanel extends Panel {
});
}
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", ProjectDependencyListViewPanel.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, Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "Project Dependency");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "project-dependency"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, dependencies.get(index));
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
index 009f06babd..4368e50ab0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.html
@@ -4,7 +4,7 @@
<table wicket:id="triggers"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/job/trigger/JobTriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
index 9948af9227..8d04e6d703 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
@@ -14,7 +14,6 @@ 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;
@@ -28,7 +27,6 @@ import io.onedev.server.buildspec.job.trigger.JobTrigger;
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;
import io.onedev.server.web.editable.EditableUtils;
@@ -54,57 +52,55 @@ class JobTriggerListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getDescription());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getDescription()));
}
+
});
columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("#Params")) {
@Override
public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getParams().size());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getParams().size()));
}
+
});
columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- if (!rowModel.getObject().getParams().isEmpty()) {
- 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");
- }
-
- };
- }
-
- });
- } else {
- cellItem.add(new Label(componentId));
- }
+ int triggerIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", JobTriggerListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String triggerType = EditableUtils.getDisplayName(triggers.get(triggerIndex).getClass());
+ return new Label(componentId, "Trigger (type: " + triggerType + ")");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "job-trigger"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, triggers.get(triggerIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
}
@Override
@@ -112,7 +108,7 @@ class JobTriggerListViewPanel extends Panel {
return "ellipsis text-right";
}
- });
+ });
IDataProvider<JobTrigger> dataProvider = new ListDataProvider<JobTrigger>() {
@@ -136,49 +132,4 @@ class JobTriggerListViewPanel extends Panel {
});
}
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", JobTriggerListViewPanel.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, "Trigger (type: " + EditableUtils.getDisplayName(triggers.get(index).getClass()) + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "job-trigger"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, triggers.get(index));
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
index b9659f6a70..4105f5616b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.html
@@ -4,7 +4,7 @@
<table wicket:id="paramSpecs"></table>
</div>
</div>
- <wicket:fragment wicket:id="columnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/param/spec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
index d3f0e07265..d207a4139d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
@@ -15,7 +15,6 @@ 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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -34,7 +33,6 @@ import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
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;
import io.onedev.server.web.editable.EditableUtils;
@@ -60,15 +58,9 @@ class ParamSpecListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, rowModel.getObject().getName());
- }
-
- });
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
+
});
columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Type")) {
@@ -76,44 +68,52 @@ class ParamSpecListViewPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
ParamSpec param = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, EditableUtils.getDisplayName(param.getClass()));
- }
-
- });
+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(param.getClass())));
}
+
});
columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+ int paramIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", ParamSpecListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
@Override
- protected Component newLabel(String componentId) {
- return new SpriteImage(componentId, "ellipsis") {
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String paramType = EditableUtils.getDisplayName(paramSpecs.get(paramIndex).getClass());
+ return new Label(componentId, "Parameter Spec (type: " + paramType + ")");
+ }
@Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon");
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "param-spec input-spec"));
}
-
+
+ @Override
+ protected Component newBody(String id) {
+ Set<String> excludedProperties = Sets.newHashSet("canBeChangedBy", "nameOfEmptyValue");
+ return BeanContext.view(id, paramSpecs.get(paramIndex), excludedProperties, true);
+ }
+
};
}
});
+ cellItem.add(fragment);
}
@Override
public String getCssClass() {
- return "text-right ellipsis";
+ return "ellipsis text-right";
}
});
@@ -147,51 +147,4 @@ class ParamSpecListViewPanel extends Panel {
response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
}
- private abstract class ColumnFragment extends Fragment {
-
- private final int index;
-
- public ColumnFragment(String id, int index) {
- super(id, "columnFrag", ParamSpecListViewPanel.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) {
- ParamSpec param = paramSpecs.get(index);
- return new Label(componentId, "Parameter Spec (type: " + EditableUtils.getDisplayName(param.getClass()) + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "param-spec input-spec"));
- }
-
- @Override
- protected Component newBody(String id) {
- Set<String> excludedProperties = Sets.newHashSet("canBeChangedBy", "nameOfEmptyValue");
- return BeanContext.view(id, paramSpecs.get(index), excludedProperties, true);
- }
-
- };
- }
-
- };
- link.add(newLabel("label"));
- add(link);
- }
-
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java
index 227c231a6b..7175faf464 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java
@@ -55,6 +55,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.annotation.VariableOption;
import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
import io.onedev.server.web.editable.string.StringPropertyEditor;
@@ -67,6 +68,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
private final String paramSpecProviderMethodName;
+ private final boolean withBuildVersion;
+
+ private final boolean withFiles;
+
private transient Map<String, ParamSpec> paramSpecs;
private transient Serializable defaultParamBean;
@@ -82,6 +87,15 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
ParamSupply param = (ParamSupply) each;
params.put(param.getName(), param);
}
+
+ VariableOption variableOption = propertyDescriptor.getPropertyGetter().getAnnotation(VariableOption.class);
+ if (variableOption != null) {
+ withBuildVersion = variableOption.withBuildVersion();
+ withFiles = variableOption.withFile();
+ } else {
+ withBuildVersion = true;
+ withFiles = true;
+ }
}
@SuppressWarnings("unchecked")
@@ -296,7 +310,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
protected List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, withBuildVersion, withFiles);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java
similarity index 73%
rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.java
rename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java
index f1a22acca4..96786cc90e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java
@@ -1,27 +1,27 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.io.Serializable;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class StepEditBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Step step;
-
- @Editable
- @NotNull
- public Step getStep() {
- return step;
- }
-
- public void setStep(Step step) {
- this.step = step;
- }
-
-}
+package io.onedev.server.web.editable.buildspec.step;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class StepBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Step step;
+
+ @Editable(name="Type", order=100)
+ @NotNull(message="may not be empty")
+ public Step getStep() {
+ return step;
+ }
+
+ public void setStep(Step step) {
+ this.step = step;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java
new file mode 100644
index 0000000000..f45430e29d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.editable.buildspec.step;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class StepCssResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public StepCssResourceReference() {
+ super(StepCssResourceReference.class, "step.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html
new file mode 100644
index 0000000000..d744c44d03
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <form wicket:id="form" class="step-edit leave-confirm">
+ <div class="modal-header">
+ <h5 id="modal-title" class="modal-title">Step</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <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/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
new file mode 100644
index 0000000000..f20dec98c8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
@@ -0,0 +1,113 @@
+package io.onedev.server.web.editable.buildspec.step;
+
+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.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.ParamSpecAware;
+import io.onedev.server.buildspec.step.Step;
+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 StepEditPanel extends Panel implements BuildSpecAware, ParamSpecAware {
+
+ private final List<Step> steps;
+
+ private final int stepIndex;
+
+ public StepEditPanel(String id, List<Step> steps, int stepIndex) {
+ super(id);
+
+ this.steps = steps;
+ this.stepIndex = stepIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ StepBean bean = new StepBean();
+ if (stepIndex != -1)
+ bean.setStep(steps.get(stepIndex));
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(StepEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", bean);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ Step step = bean.getStep();
+ if (editor.isValid()) {
+ if (stepIndex != -1) {
+ steps.set(stepIndex, step);
+ } else {
+ steps.add(step);
+ }
+ 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(StepEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ 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/step/StepListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
index 38dca5230f..533c96bba0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
@@ -1,19 +1,12 @@
<wicket:panel>
- <div class="steps steps-editor">
- <div wicket:id="steps" class="step"></div>
- <a wicket:id="add" class="add btn btn-light btn-hover-primary btn-block" title="Add new step"><wicket:svg href="plus" class="icon align-middle mr-1"></wicket:svg></a>
- </div>
- <wicket:fragment wicket:id="stepEditFrag">
- <div class="head step-head d-flex align-items-center">
- <span class="index badge badge-light-warning mr-2"></span>
- <span class="drag-indicator mr-2"><wicket:svg href="grip" class="icon"></wicket:svg></span>
- <a wicket:id="delete" title="Delete this step" class="btn btn-light btn-xs btn-icon btn-hover-danger text-muted mr-4">
- <wicket:svg href="trash" class="icon"/>
- </a>
- </div>
- <div class="body">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
+ <div class="step-list">
+ <table wicket:id="steps"></table>
+ <div class="foot">
+ <a wicket:id="addNew" title="Add new step" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
- </wicket:fragment>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-xs btn-icon 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-xs btn-icon 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/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
index e2b0370383..537b2412f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
@@ -2,29 +2,42 @@ package io.onedev.server.web.editable.buildspec.step;
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.feedback.FencedFeedbackPanel;
+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.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
+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.step.CommandStep;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.ParamSpecAware;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.util.Path;
-import io.onedev.server.util.PathNode;
-import io.onedev.server.util.PathNode.Indexed;
+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.editable.PropertyContext;
+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;
@@ -32,98 +45,197 @@ import io.onedev.server.web.editable.PropertyUpdating;
@SuppressWarnings("serial")
class StepListEditPanel extends PropertyEditor<List<Serializable>> {
- private final List<StepEditBean> beans;
-
- private RepeatingView stepsView;
+ private final List<Step> steps;
public StepListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
- beans = new ArrayList<>();
- for (Serializable each: model.getObject()) {
- StepEditBean bean = new StepEditBean();
- bean.setStep((Step) each);
- beans.add(bean);
+ steps = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ steps.add((Step) each);
}
}
- @Override
- protected String getInvalidClass() {
- return null;
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new StepEditPanel(id, steps, -1) {
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return StepListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return StepListEditPanel.this.getParamSpecs();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
- stepsView = new RepeatingView("steps");
- for (StepEditBean bean: beans)
- stepsView.add(newStepEditor(stepsView.newChildId(), bean));
- add(stepsView);
+ List<IColumn<Step, Void>> columns = new ArrayList<>();
- add(new AjaxLink<Void>("add") {
+ columns.add(new AbstractColumn<Step, Void>(Model.of("")) {
@Override
- public void onClick(AjaxRequestTarget target) {
- StepEditBean bean = new StepEditBean();
- bean.setStep(new CommandStep());
- Component stepEditor = newStepEditor(stepsView.newChildId(), bean);
- stepsView.add(stepEditor);
- target.add(stepEditor);
-
- String script = String.format(""
- + "$('#%s').before('<div id=\"%s\"/>');",
- getMarkupId(), stepEditor.getMarkupId());
- target.prependJavaScript(script);
- target.appendJavaScript("onedev.server.stepEdit.renderStepIndex();");
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> 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";
+ }
+
+ });
- add(new SortBehavior() {
+ columns.add(new AbstractColumn<Step, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ }
- @SuppressWarnings("deprecation")
+ });
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("Condition")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getCondition().getDisplayName()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", StepListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new StepEditPanel(id, steps, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return StepListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return StepListEditPanel.this.getParamSpecs();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ steps.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ IDataProvider<Step> dataProvider = new ListDataProvider<Step>() {
+
+ @Override
+ protected List<Step> getData() {
+ return steps;
+ }
+
+ };
+
+ DataTable<Step, Void> dataTable;
+ add(dataTable = new DataTable<Step, Void>("steps", 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++)
- stepsView.swap(fromIndex+i, fromIndex+i+1);
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(steps, fromIndex+i, fromIndex+i+1);
} else {
- for (int i=0; i<fromIndex-toIndex; i++)
- stepsView.swap(fromIndex-i, fromIndex-i-1);
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(steps, fromIndex-i, fromIndex-i-1);
}
- target.appendJavaScript("onedev.server.stepEdit.renderStepIndex();");
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
}
- }.sortable(">.steps").items(".step").handle(".step-head"));
-
+ }.sortable("tbody"));
}
-
- protected Component newStepEditor(String componentId, StepEditBean bean) {
- Fragment fragment = new Fragment(componentId, "stepEditFrag", this);
- fragment.add(new AjaxLink<Void>("delete") {
- @Override
- public void onClick(AjaxRequestTarget target) {
- stepsView.remove(fragment);
-
- String script = String.format(""
- + "$('#%s').remove();"
- + "onedev.server.stepEdit.renderStepIndex();",
- fragment.getMarkupId());
- target.appendJavaScript(script);
- }
-
- });
- fragment.add(new FencedFeedbackPanel("feedback", fragment));
- fragment.add(PropertyContext.edit("editor", bean, "step"));
- fragment.setOutputMarkupId(true);
-
- return fragment;
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new StepCssResourceReference()));
}
-
+
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
@@ -134,30 +246,28 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
}
}
- @SuppressWarnings("unchecked")
@Override
protected List<Serializable> convertInputToValue() throws ConversionException {
List<Serializable> value = new ArrayList<>();
- for (Component each: stepsView) {
- PropertyEditor<Serializable> editor = (PropertyEditor<Serializable>) each.get("editor");
- value.add(editor.getConvertedInput());
- }
+ for (Step each: steps)
+ value.add(each);
return value;
}
- @SuppressWarnings("deprecation")
- @Override
- public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {
- int index = ((Indexed) propertyNode).getIndex();
- PropertyEditor<?> editor = (PropertyEditor<?>) stepsView.get(index).get("editor");
- editor.error(pathInProperty, errorMessage);
+ private BuildSpec getBuildSpec() {
+ BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class);
+ if (buildSpecAware != null)
+ return buildSpecAware.getBuildSpec();
+ else
+ return null;
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new StepResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.stepEdit.renderStepIndex();"));
+
+ private List<ParamSpec> getParamSpecs() {
+ ParamSpecAware paramSpecAware = findParent(ParamSpecAware.class);
+ if (paramSpecAware != null)
+ return paramSpecAware.getParamSpecs();
+ else
+ return null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java
index 2be70abb58..85fa8dc742 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java
@@ -31,10 +31,11 @@ public class StepListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null)
+ if (model.getObject() != null) {
return new StepListViewPanel(id, model.getObject());
- else
+ } else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
index 2fc89c4a9e..f1de387d68 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html
@@ -1,10 +1,10 @@
-<wicket:panel>
- <div class="steps steps-viewer">
- <div wicket:id="steps" class="step">
- <div wicket:id="title" class="head badge badge-light-warning"></div>
- <div class="body">
- <div wicket:id="viewer"></div>
- </div>
- </div>
- </div>
+<wicket:panel>
+ <div class="step-list">
+ <div class="body">
+ <table wicket:id="steps"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="showDetailFrag">
+ <a wicket:id="link"><wicket:svg href="ellipsis" class="icon align-middle"/></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/step/StepListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
index cf1e8a269e..c8e7d9fae8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
@@ -1,56 +1,142 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.editable.PropertyContext;
-
-@SuppressWarnings("serial")
-public class StepListViewPanel extends Panel {
-
- private final List<StepEditBean> beans = new ArrayList<>();
-
- public StepListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements) {
- StepEditBean bean = new StepEditBean();
- bean.setStep((Step) each);
- beans.add(bean);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ListView<StepEditBean>("steps", beans) {
-
- @Override
- protected void populateItem(ListItem<StepEditBean> item) {
- StepEditBean bean = item.getModelObject();
- String typeName = EditableUtils.getDisplayName(bean.getStep().getClass());
- item.add(new Label("title", "#" + (item.getIndex()+1) + " - " + typeName));
- item.add(PropertyContext.view("viewer", bean, "step"));
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new StepResourceReference()));
- }
-
-}
+package io.onedev.server.web.editable.buildspec.step;
+
+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.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+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.step.Step;
+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.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+
+@SuppressWarnings("serial")
+class StepListViewPanel extends Panel {
+
+ private final List<Step> steps = new ArrayList<>();
+
+ public StepListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ steps.add((Step) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<Step, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("Condition")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getCondition().getDisplayName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ int stepIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", StepListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String stepType = EditableUtils.getDisplayName(steps.get(stepIndex).getClass());
+ return new Label(componentId, "Step (type: " + stepType + ")");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "step"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, steps.get(stepIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<Step> dataProvider = new ListDataProvider<Step>() {
+
+ @Override
+ protected List<Step> getData() {
+ return steps;
+ }
+
+ };
+
+ add(new DataTable<Step, Void>("steps", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new StepCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.java
deleted file mode 100644
index ba7e3e5e5c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class StepResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public StepResourceReference() {
- super(StepResourceReference.class, "step.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- StepResourceReference.class, "step.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
index dea96209ee..e8be9c3770 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
@@ -1,18 +1,5 @@
-.steps>.step {
- border: 2px dashed var(--secondary);
- border-radius: 0.42rem;
- padding: 0.6rem 1.2rem;
- margin-bottom: 1.2rem;
- background: white;
+@media(min-width: 768px) {
+.step.floating.off-canvas {
+ width: 600px;
}
-.steps>.step:last-child {
- margin-bottom: 0;
}
-
-.steps>.step>.head {
- margin-bottom: 1rem;
-}
-.steps-viewer>.step>div>div>div>div>.type-selector {
- display: none;
-}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.js b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.js
deleted file mode 100644
index f321592582..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.js
+++ /dev/null
@@ -1,7 +0,0 @@
-onedev.server.stepEdit = {
- renderStepIndex: function() {
- $(".steps>.step").each(function() {
- $(this).find(".index").text("#" + ($(this).index()+1));
- });
- }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
index ab86a7153c..0e592f3170 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
@@ -26,6 +26,7 @@ import com.google.common.base.CharMatcher;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
+import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.util.ComponentContext;
@@ -88,13 +89,14 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {
if (variableProvider.length() != 0) {
ComponentContext.push(new ComponentContext(input));
try {
- for (String each: (List<String>) ReflectionUtils.invokeStaticMethod(
- descriptor.getBeanClass(), variableProvider)) {
- if (each.toLowerCase().contains(matchWith)) {
- ObjectNode variableNode = mapper.createObjectNode();
- variableNode.put("text", "@" + StringUtils.escape(each, "@") + "@");
- variablesNode.add(variableNode);
- }
+ for (InputSuggestion suggestion: ((List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(
+ descriptor.getBeanClass(), variableProvider, matchWith))) {
+ ObjectNode variableNode = mapper.createObjectNode();
+ String text = "@" + suggestion.getContent() + "@";
+ variableNode.put("text", text);
+ if (suggestion.getDescription() != null)
+ variableNode.put("description", suggestion.getDescription());
+ variablesNode.add(variableNode);
}
} finally {
ComponentContext.pop();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
index 7d95670bfb..2673e234e9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js
@@ -41,30 +41,34 @@ onedev.server.codeSupport = {
});
onedev.server.codeSupport.adjustHeight($input);
-
- cm.on("keypress", function(cm, event) {
- if (event.key == "@") {
- // Give codemirror a chance to handle keypress first
- setTimeout(function() {
- var cursor = cm.getCursor();
- var line = cursor.line;
- var start = cursor.ch;
-
- var beforeCursor = cm.doc.getLine(line).substring(0, start);
-
- var escapeFiltered = beforeCursor.replace("@@", "");
- if ((escapeFiltered.match(/@/g) || []).length % 2 == 1) { // only show hint when type left @
- function hint(cm, showHintCallback) {
- var end = cm.getCursor().ch;
- var matchWith = cm.doc.getLine(line).substring(start, end);
- $input.data("showHintCallback", showHintCallback);
- varQueryCallback(matchWith, line, start);
+
+ function getLineBeforeCursor(cm) {
+ var cursor = cm.getCursor();
+ var line = cursor.line;
+ return cm.doc.getLine(line).substring(0, cursor.ch);
+ }
+ cm.on("cursorActivity", function(cm, event) {
+ setTimeout(function() {
+ var lineBeforeCursor = getLineBeforeCursor(cm);
+ if ($(".CodeMirror-hints").length == 0 && $(lineBeforeCursor.replace("@@", "").match(/@/g) || []).length % 2 == 1) {
+ function hint(cm, showHintCallback) {
+ $input.data("showHintCallback", showHintCallback);
+ var lineBeforeCursor = getLineBeforeCursor(cm);
+ var lastIndex = lineBeforeCursor.lastIndexOf('@') + 1;
+ var matchWith = lineBeforeCursor.substring(lastIndex, cm.getCursor().ch);
+ varQueryCallback(matchWith, cm.getCursor().line, lastIndex);
+ }
+ hint.async = true;
+ var extraKeys = {
+ Esc: function(cm, handle) {
+ // Close in a timeout so modal can check existance of
+ // hints to determine if Esc should be handled
+ setTimeout(function() {handle.close();}, 0);
}
- hint.async = true;
- CodeMirror.showHint(cm, hint, {completeSingle: false});
- }
- }, 0);
- }
+ };
+ CodeMirror.showHint(cm, hint, {completeSingle: false, closeCharacters: /@/, extraKeys: extraKeys});
+ }
+ }, 0);
});
$input.on("beforeDelete", function() {
@@ -74,10 +78,36 @@ onedev.server.codeSupport = {
showVariables: function(inputId, variables, line, start) {
var $input = $("#" + inputId);
var cm = $input.next(".CodeMirror")[0].CodeMirror;
+ for (var i = 0; i < variables.length; i++) {
+ variables[i].render = function(element, self, data) {
+ if (data.description) {
+ var $hint = $(document.createElement("div"));
+ $hint.addClass("d-flex flex-nowrap justify-content-between");
+ var $text = $(document.createElement("div"));
+ $text.text(data.text);
+ $hint.append($text);
+ var $description = $(document.createElement("div"));
+ $description.addClass("text-muted ml-4");
+ $description.text(data.description);
+ $hint.append($description);
+ element.append($hint[0]);
+ } else {
+ element.append(data.text);
+ }
+ }
+ }
+
+ var afterCursor = cm.doc.getLine(line).substring(start);
+ var to = afterCursor.indexOf('@');
+ if (to == -1)
+ to = cm.getCursor().ch;
+ else
+ to += start+1;
+
$input.data("showHintCallback")({
list: variables,
from: CodeMirror.Pos(line, start-1),
- to: CodeMirror.Pos(line, cm.getCursor().ch)
+ to: CodeMirror.Pos(line, to)
});
},
onViewerLoad: function(inputId, modeName) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index 39ee741265..495d0b1113 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -38,9 +38,8 @@
}
.editable table.norecords tfoot td {
border: none;
- border-radius: 0.42rem;
- background-color: var(--light);
- opacity: 0.5;
+ padding: 0;
+ font-style: italic;
background-image: none;
height: auto;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java
new file mode 100644
index 0000000000..71b46c7a0b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.admin.groovyscript;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class GroovyScriptCssResourceReference extends CssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public GroovyScriptCssResourceReference() {
+ super(GroovyScriptCssResourceReference.class, "groovy-script.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
index d2e4a7a241..373e6810bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
@@ -254,7 +254,7 @@ public class GroovyScriptListPage extends AdministrationPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new GroovyScriptResourceReference()));
+ response.render(CssHeaderItem.forReference(new GroovyScriptCssResourceReference()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.java
deleted file mode 100644
index 7db9880754..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.admin.groovyscript;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class GroovyScriptResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public GroovyScriptResourceReference() {
- super(GroovyScriptResourceReference.class, "groovy-script.css");
- }
-
-}
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 00761f7984..5959d0455f 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
@@ -37,6 +37,8 @@
</a>
</div>
</div>
- <div wicket:id="element" class="main flex-grow-1 ml-4"></div>
+ <div class="main flex-grow-1 ml-4">
+ <div wicket:id="element" class="content"></div>
+ </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/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
index 2602d01703..7c5a333d2e 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
@@ -10,7 +10,7 @@ onedev.server.buildSpec = {
if (nameChangeCallback) {
var $main = $elements.children(".main");
- var $input = $main.find(">div>div>.property-name input");
+ var $input = $main.find(">div>div>div>.property-name input");
function syncName() {
var name = $input.val().trim();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
index 8cc180e16e..908b315286 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
@@ -30,9 +30,11 @@ public class GitLinkPanel extends BlobViewPanel {
Submodule submodule = Submodule.fromString(blob.getText().getContent());
WebMarkupContainer link;
SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- if (submodule.getUrl().startsWith(settingManager.getSystemSetting().getServerUrl() + "/")) {
+ String rootUrl = settingManager.getSystemSetting().getServerUrl() + "/";
+ if (submodule.getUrl().startsWith(rootUrl)) {
link = new WebMarkupContainer("link");
- link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId()));
+ String projectName = submodule.getUrl().substring(rootUrl.length());
+ link.add(AttributeModifier.replace("href", rootUrl + "projects/" + projectName + "/blob/" + submodule.getCommitId()));
} else {
link = new Link<Void>("link") {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index d514dafca3..cb746e64f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -137,37 +137,52 @@ public class SuggestionUtils {
}
public static List<InputSuggestion> suggestVariables(Project project, BuildSpec buildSpec,
- @Nullable List<ParamSpec> paramSpecs, String matchWith) {
- matchWith = matchWith.toLowerCase();
+ @Nullable List<ParamSpec> paramSpecs, String matchWith, boolean withBuildVersion,
+ boolean withFile) {
+ String lowerCaseMatchWith = matchWith.toLowerCase();
int numSuggestions = 0;
List<InputSuggestion> suggestions = new ArrayList<>();
Map<String, String> variables = new LinkedHashMap<>();
- for (JobVariable var: JobVariable.values())
- variables.put(var.name().toLowerCase(), null);
+ for (JobVariable var: JobVariable.values()) {
+ if (var != JobVariable.BUILD_VERSION || withBuildVersion)
+ variables.put(var.name().toLowerCase(), null);
+ }
if (paramSpecs != null) {
for (ParamSpec paramSpec: paramSpecs)
- variables.put(VariableInterpolator.PREFIX_PARAMS + paramSpec.getName(), paramSpec.getDescription());
+ variables.put(VariableInterpolator.PREFIX_PARAM + paramSpec.getName(), paramSpec.getDescription());
}
for (String propertyName: buildSpec.getPropertyMap().keySet())
- variables.put(VariableInterpolator.PREFIX_PROPERTIES + propertyName, null);
+ variables.put(VariableInterpolator.PREFIX_PROPERTY + propertyName, null);
for (JobSecret secret: project.getBuildSetting().getJobSecrets())
- variables.put(VariableInterpolator.PREFIX_SECRETS + secret.getName(), null);
+ variables.put(VariableInterpolator.PREFIX_SECRET + secret.getName(), null);
+
+ if (withFile) {
+ String filePath;
+ if (lowerCaseMatchWith.startsWith(VariableInterpolator.PREFIX_FILE))
+ filePath = matchWith.substring(VariableInterpolator.PREFIX_FILE.length());
+ else
+ filePath = "";
+ if (filePath.length() == 0)
+ filePath = "example.txt";
+ variables.put(VariableInterpolator.PREFIX_FILE + filePath, "Use content of specified file");
+ }
+
for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts())
- variables.put(VariableInterpolator.PREFIX_SCRIPTS + script.getName(), null);
+ variables.put(VariableInterpolator.PREFIX_SCRIPT + script.getName(), null);
for (ScriptContribution contribution: OneDev.getExtensions(ScriptContribution.class)) {
- String varName = VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX
+ String varName = VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX
+ contribution.getScript().getName();
if (!variables.containsKey(varName))
variables.put(varName, null);
}
for (Map.Entry<String, String> entry: variables.entrySet()) {
- int index = entry.getKey().toLowerCase().indexOf(matchWith);
+ int index = entry.getKey().toLowerCase().indexOf(lowerCaseMatchWith);
if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {
suggestions.add(new InputSuggestion(entry.getKey(), entry.getValue(),
- new LinearRange(index, index+matchWith.length())));
+ new LinearRange(index, index+lowerCaseMatchWith.length())));
}
}
return suggestions;
diff --git a/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java
index 7e5801863f..60ddd068ac 100644
--- a/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java
@@ -51,7 +51,7 @@ public class VariableInterpolatorTest {
}
@Editable
- static class TestBean {
+ public static class TestBean {
private String name;
@@ -91,7 +91,7 @@ public class VariableInterpolatorTest {
}
@Editable
- static class TestParentBean {
+ public static class TestParentBean {
private String name;
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index a55e4b64ef..2342ae767e 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index aca4d7be36..d8f35c7883 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index 6710c7c72d..a2de5dddfc 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index 5ddc36ffdc..3688919cf2 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
index 924a1be6e7..794d512fab 100644
--- a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java
@@ -16,7 +16,9 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
import io.onedev.server.buildspec.job.trigger.PullRequestUpdateTrigger;
+import io.onedev.server.buildspec.step.CheckoutStep;
import io.onedev.server.buildspec.step.CommandStep;
+import io.onedev.server.buildspec.step.SetBuildVersionStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -41,17 +43,30 @@ public class GradleJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("gradle ci");
- CommandStep step = new CommandStep();
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
- step.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
- step.setCommands(Lists.newArrayList(
- "set -e",
+ String imageName = "@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@";
+
+ CommandStep detectBuildVersion = new CommandStep();
+ detectBuildVersion.setName("detect build version");
+ detectBuildVersion.setImage(imageName);
+ detectBuildVersion.setCommands(Lists.newArrayList(
"echo \"Detecting project version (may require some time while downloading gradle dependencies)...\"",
- "buildVersion=$(gradle properties | grep ^version: | grep -v unspecified | cut -c10-)",
- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
- "gradle build"));
+ "echo $(gradle properties | grep ^version: | grep -v unspecified | cut -c10-) > buildVersion"));
+ job.getSteps().add(detectBuildVersion);
+
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@file:buildVersion@");
+ job.getSteps().add(setBuildVersion);
- job.setSteps(Lists.newArrayList(step));
+ CommandStep runGradle = new CommandStep();
+ runGradle.setName("run gradle");
+ runGradle.setImage(imageName);
+ runGradle.setCommands(Lists.newArrayList("gradle build"));
+ job.getSteps().add(runGradle);
setupTriggers(job);
setupCaches(job);
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index e687dc30da..4e48be8798 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
index ef94753919..6f5358e706 100644
--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java
@@ -21,7 +21,9 @@ import io.onedev.server.buildspec.job.CacheSpec;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
+import io.onedev.server.buildspec.step.CheckoutStep;
import io.onedev.server.buildspec.step.CommandStep;
+import io.onedev.server.buildspec.step.SetBuildVersionStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -44,21 +46,31 @@ public class MavenJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("maven ci");
- CommandStep step = new CommandStep();
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
- step.setImage("@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
- /*
- * Before running maven test, we extract version of the project and use LogInstruction to tell
- * OneDev using extracted version for current build
- */
- step.setCommands(Lists.newArrayList(
+ String imageName = "@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@";
+
+ CommandStep detectBuildVersion = new CommandStep();
+ detectBuildVersion.setName("detect build version");
+ detectBuildVersion.setImage(imageName);
+ detectBuildVersion.setCommands(Lists.newArrayList(
"echo \"Detecting project version (may require some time while downloading maven dependencies)...\"",
- "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",
- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
- "echo",
- "mvn clean test"));
+ "echo $(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout) > buildVersion"));
+ job.getSteps().add(detectBuildVersion);
+
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@file:buildVersion@");
+ job.getSteps().add(setBuildVersion);
+
+ CommandStep runMaven = new CommandStep();
+ runMaven.setName("run maven");
+ runMaven.setImage(imageName);
+ runMaven.setCommands(Lists.newArrayList("mvn clean test"));
- job.setSteps(Lists.newArrayList(step));
+ job.getSteps().add(runMaven);
// Trigger the job automatically when there is a push to the branch
BranchUpdateTrigger trigger = new BranchUpdateTrigger();
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index eaa759874a..bf7366620a 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
index 9e8cb9346b..25306356c8 100644
--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java
@@ -22,7 +22,9 @@ import io.onedev.server.buildspec.job.CacheSpec;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;
+import io.onedev.server.buildspec.step.CheckoutStep;
import io.onedev.server.buildspec.step.CommandStep;
+import io.onedev.server.buildspec.step.SetBuildVersionStep;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
@@ -57,12 +59,20 @@ public class NodeJobSuggestion implements JobSuggestion {
if (content.indexOf("angular/core") != -1) { // Recognize angular projects
Job job = new Job();
job.setName("angular ci");
+
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
+
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@");
+ job.getSteps().add(setBuildVersion);
- CommandStep step = new CommandStep();
- step.setImage("1dev/buildspec-node:10.16-alpine-chrome");
+ CommandStep runCommands = new CommandStep();
+ runCommands.setName("build & test");
+ runCommands.setImage("1dev/buildspec-node:10.16-alpine-chrome");
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
- "echo",
"npm install",
"npm install @@angular/cli");
@@ -102,8 +112,8 @@ public class NodeJobSuggestion implements JobSuggestion {
"npx ng build"));
}
- step.setCommands(commands);
- job.setSteps(Lists.newArrayList(step));
+ runCommands.setCommands(commands);
+ job.getSteps().add(runCommands);
setupTriggers(job);
setupCaches(job);
@@ -114,12 +124,20 @@ public class NodeJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("react ci");
- CommandStep step = new CommandStep();
- step.setImage("node:10.16-alpine");
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
+
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@");
+ job.getSteps().add(setBuildVersion);
+
+ CommandStep runCommands = new CommandStep();
+ runCommands.setName("build & test");
+ runCommands.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
- "echo",
"npm install typescript",
"npm install",
"export CI=TRUE");
@@ -155,8 +173,8 @@ public class NodeJobSuggestion implements JobSuggestion {
"npx react-scripts build"));
}
- step.setCommands(commands);
- job.setSteps(Lists.newArrayList(step));
+ runCommands.setCommands(commands);
+ job.getSteps().add(runCommands);
setupTriggers(job);
setupCaches(job);
@@ -167,14 +185,20 @@ public class NodeJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("vue ci");
- CommandStep step = new CommandStep();
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
- step.setImage("node:10.16-alpine");
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@");
+ job.getSteps().add(setBuildVersion);
+
+ CommandStep runCommands = new CommandStep();
+ runCommands.setName("build & test");
+ runCommands.setImage("node:10.16-alpine");
- List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
- "echo",
- "npm install");
+ List<String> commands = Lists.newArrayList("npm install");
if (jsonNode.has("scripts")) {
JsonNode jsonScripts = jsonNode.get("scripts");
@@ -203,8 +227,8 @@ public class NodeJobSuggestion implements JobSuggestion {
commands.add("npx jest");
}
- step.setCommands(commands);
- job.setSteps(Lists.newArrayList(step));
+ runCommands.setCommands(commands);
+ job.getSteps().add(runCommands);
setupTriggers(job);
setupCaches(job);
@@ -215,14 +239,20 @@ public class NodeJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("express ci");
- CommandStep step = new CommandStep();
+ CheckoutStep checkout = new CheckoutStep();
+ checkout.setName("checkout");
+ job.getSteps().add(checkout);
- step.setImage("node:10.16-alpine");
+ SetBuildVersionStep setBuildVersion = new SetBuildVersionStep();
+ setBuildVersion.setName("set build version");
+ setBuildVersion.setBuildVersion("@" + VariableInterpolator.PREFIX_SCRIPT + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@");
+ job.getSteps().add(setBuildVersion);
+
+ CommandStep runCommands = new CommandStep();
+ runCommands.setName("build & test");
+ runCommands.setImage("node:10.16-alpine");
- List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.PREFIX_SCRIPTS + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
- "echo",
- "npm install");
+ List<String> commands = Lists.newArrayList("npm install");
if (jsonNode.has("scripts")) {
JsonNode jsonScripts = jsonNode.get("scripts");
@@ -249,9 +279,9 @@ public class NodeJobSuggestion implements JobSuggestion {
} else {
commands.add("npx mocha");
}
- step.setCommands(commands);
+ runCommands.setCommands(commands);
- job.setSteps(Lists.newArrayList(step));
+ job.getSteps().add(runCommands);
setupTriggers(job);
setupCaches(job);
diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xml
index dbd2fca608..0d41951e44 100644
--- a/server-plugin/server-plugin-executor-docker/pom.xml
+++ b/server-plugin/server-plugin-executor-docker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>
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 867cab6ad8..805cc3392c 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
@@ -1,12 +1,21 @@
package io.onedev.server.plugin.docker;
+import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;
+import static io.onedev.k8shelper.KubernetesHelper.getCacheInstances;
+import static io.onedev.k8shelper.KubernetesHelper.installGitCert;
+import static io.onedev.k8shelper.KubernetesHelper.preprocess;
+import static io.onedev.k8shelper.KubernetesHelper.readPlaceholderValues;
+import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;
+import static io.onedev.k8shelper.KubernetesHelper.stringifyPosition;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -43,10 +52,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.CheckoutExecutable;
+import io.onedev.k8shelper.CloneInfo;
import io.onedev.k8shelper.CommandExecutable;
import io.onedev.k8shelper.CompositeExecutable;
-import io.onedev.k8shelper.Executable;
-import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.k8shelper.LeafExecutable;
import io.onedev.k8shelper.LeafHandler;
import io.onedev.k8shelper.ServerExecutable;
@@ -322,7 +331,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
StringBuilder builder = new StringBuilder();
docker.clearArgs();
docker.addArgs("inspect", containerName);
- docker.execute(new LineConsumer(StandardCharsets.UTF_8.name()) {
+ docker.execute(new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
@@ -348,6 +357,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
if (stateNode.get("Status").asText().equals("running")) {
docker.clearArgs();
docker.addArgs("exec", containerName);
+
if (SystemUtils.IS_OS_WINDOWS)
docker.addArgs("cmd", "/c", jobService.getReadinessCheckCommand());
else
@@ -380,14 +390,14 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
docker.clearArgs();
docker.addArgs("logs", containerName);
- docker.execute(new LineConsumer(StandardCharsets.UTF_8.name()) {
+ docker.execute(new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
jobLogger.log(line);
}
- }, new LineConsumer(StandardCharsets.UTF_8.name()) {
+ }, new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
@@ -427,9 +437,9 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
FileUtils.createDir(hostCacheHome);
jobLogger.log("Allocating job caches...") ;
- Map<CacheInstance, Date> cacheInstances = KubernetesHelper.getCacheInstances(hostCacheHome);
+ Map<CacheInstance, Date> cacheInstances = getCacheInstances(hostCacheHome);
Map<CacheInstance, String> cacheAllocations = jobManager.allocateJobCaches(jobToken, new Date(), cacheInstances);
- KubernetesHelper.preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
+ preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
@Override
public void accept(File directory) {
@@ -465,7 +475,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
AtomicReference<File> hostHome = new AtomicReference<>(null);
try {
- LineConsumer logger = new LineConsumer(StandardCharsets.UTF_8.name()) {
+ LineConsumer logger = new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
@@ -473,98 +483,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
};
-
- if (jobContext.isRetrieveSource()) {
- jobLogger.log("Retrieving source code...");
- hostHome.set(FileUtils.createTempDir());
- Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
- git.workingDir(hostWorkspace).environments().put("HOME", hostHome.get().getAbsolutePath());
-
- jobContext.getCloneInfo().writeAuthData(hostHome.get(), git, logger, logger);
-
- List<String> trustCertContent = new ArrayList<>();
- ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
- File keystoreFile = serverConfig.getKeystoreFile();
- if (keystoreFile != null) {
- String password = serverConfig.getKeystorePassword();
- for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
- trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
- }
- if (serverConfig.getTrustCertsDir() != null) {
- for (File file: serverConfig.getTrustCertsDir().listFiles()) {
- if (file.isFile())
- trustCertContent.addAll(FileUtils.readLines(file, StandardCharsets.UTF_8));
- }
- }
-
- if (!trustCertContent.isEmpty()) {
- KubernetesHelper.installGitCert(new File(hostHome.get(), "trust-cert.pem"), trustCertContent,
- git, logger, logger);
- }
-
- Integer cloneDepth = jobContext.getCloneDepth();
-
- KubernetesHelper.clone(hostWorkspace, jobContext.getProjectGitDir().getAbsolutePath(),
- jobContext.getCommitId().name(), cloneDepth, git, logger, logger);
-
- git.clearArgs();
- git.addArgs("remote", "add", "origin", jobContext.getCloneInfo().getCloneUrl());
- git.execute(logger, logger).checkReturnCode();
-
- if (new File(hostWorkspace, ".gitmodules").exists()) {
- if (SystemUtils.IS_OS_WINDOWS || !(jobContext.getCloneInfo() instanceof SshCloneInfo)) {
- jobLogger.log("Retrieving submodules...");
-
- git.clearArgs();
- git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet");
- if (cloneDepth != null)
- git.addArgs("--depth=" + cloneDepth);
- git.execute(logger, logger).checkReturnCode();
- } else {
- /*
- * We need to update submodules within a helper image in order to use our own .ssh folder.
- * Specifying HOME env to change ~/.ssh folder does not have effect on Linux
- */
- Commandline cmd = newDocker();
- String containerName = network + "-submodule-update-helper";
- 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",
- "submodule", "update", "--init", "--recursive", "--force", "--quiet");
- if (cloneDepth != null)
- cmd.addArgs("--depth=" + cloneDepth);
-
- jobLogger.log("Retrieving submodules with helper image...");
-
- cmd.execute(logger, logger, null, new ProcessKiller() {
-
- @Override
- public void kill(Process process, String executionId) {
- jobLogger.log("Stopping submodule update helper 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();
- }
- }
- }
jobLogger.log("Copying job dependencies...");
jobContext.copyDependencies(hostWorkspace);
@@ -572,28 +490,18 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
String containerBuildHome;
String containerWorkspace;
String containerEntryPoint;
- String[] containerCommand;
if (SystemUtils.IS_OS_WINDOWS) {
containerBuildHome = "C:\\onedev-build";
containerWorkspace = "C:\\onedev-build\\workspace";
containerEntryPoint = "cmd";
-
- if (hostHome.get() != null)
- containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\onedev\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};
- else
- containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};
} else {
containerBuildHome = "/onedev-build";
containerWorkspace = "/onedev-build/workspace";
containerEntryPoint = "sh";
- 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"};
}
jobContext.reportJobWorkspace(containerWorkspace);
- Executable entryExecutable = new CompositeExecutable(jobContext.getActions());
+ CompositeExecutable entryExecutable = new CompositeExecutable(jobContext.getActions());
List<String> errorMessages = new ArrayList<>();
@@ -601,26 +509,43 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
@Override
public boolean execute(LeafExecutable executable, List<Integer> position) {
- String positionStr = KubernetesHelper.stringifyPosition(position);
+ String stepNames = entryExecutable.getNamesAsString(position);
+ jobLogger.log("Running step \"" + stepNames + "\"...");
+
if (executable instanceof CommandExecutable) {
CommandExecutable commandExecutable = (CommandExecutable) executable;
+ String[] containerCommand;
if (SystemUtils.IS_OS_WINDOWS) {
+ if (hostHome.get() != null)
+ containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\onedev\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};
+ else
+ containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};
File scriptFile = new File(hostBuildHome, "job-commands.bat");
try {
- FileUtils.writeLines(scriptFile, commandExecutable.getCommands(), "\r\n");
+ FileUtils.writeLines(
+ scriptFile,
+ new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), hostBuildHome)),
+ "\r\n");
} catch (IOException e) {
throw new RuntimeException(e);
}
} else {
+ 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"};
File scriptFile = new File(hostBuildHome, "job-commands.sh");
try {
- FileUtils.writeLines(scriptFile, commandExecutable.getCommands(), "\n");
+ FileUtils.writeLines(
+ scriptFile,
+ new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), hostBuildHome)),
+ "\n");
} catch (IOException e) {
throw new RuntimeException(e);
}
}
- String containerName = network + "-step-" + positionStr;
+ String containerName = network + "-step-" + stringifyPosition(position);
Commandline docker = newDocker();
docker.clearArgs();
docker.addArgs("run", "--name=" + containerName, "--network=" + network);
@@ -656,8 +581,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
docker.addArgs(containerCommand);
- jobLogger.log("Running step #" + positionStr + "...");
-
ExecutionResult result = docker.execute(logger, logger, null, new ProcessKiller() {
@Override
@@ -684,21 +607,128 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
});
if (result.getReturnCode() != 0) {
- errorMessages.add("Step #" + positionStr + ": Command failed with exit code " + result.getReturnCode());
+ errorMessages.add("Step \"" + stepNames + "\": Command failed with exit code " + result.getReturnCode());
return false;
} else {
return true;
}
+ } else if (executable instanceof CheckoutExecutable) {
+ try {
+ CheckoutExecutable checkoutExecutable = (CheckoutExecutable) executable;
+ jobLogger.log("Checking out code...");
+ if (hostHome.get() == null)
+ hostHome.set(FileUtils.createTempDir());
+ Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
+ git.workingDir(hostWorkspace).environments().put("HOME", hostHome.get().getAbsolutePath());
+
+ CloneInfo cloneInfo = checkoutExecutable.getCloneInfo();
+
+ cloneInfo.writeAuthData(hostHome.get(), git, logger, logger);
+
+ List<String> trustCertContent = new ArrayList<>();
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ File keystoreFile = serverConfig.getKeystoreFile();
+ if (keystoreFile != null) {
+ String password = serverConfig.getKeystorePassword();
+ for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
+ trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
+ }
+ if (serverConfig.getTrustCertsDir() != null) {
+ for (File file: serverConfig.getTrustCertsDir().listFiles()) {
+ if (file.isFile())
+ trustCertContent.addAll(FileUtils.readLines(file, UTF_8));
+ }
+ }
+
+ if (!trustCertContent.isEmpty()) {
+ installGitCert(new File(hostHome.get(), "trust-cert.pem"), trustCertContent,
+ git, logger, logger);
+ }
+
+ int cloneDepth = checkoutExecutable.getCloneDepth();
+
+ cloneRepository(hostWorkspace, jobContext.getProjectGitDir().getAbsolutePath(),
+ jobContext.getCommitId().name(), cloneDepth, git, logger, logger);
+
+ git.clearArgs();
+ git.addArgs("remote", "add", "origin", cloneInfo.getCloneUrl());
+ git.execute(logger, logger).checkReturnCode();
+
+ if (new File(hostWorkspace, ".gitmodules").exists()) {
+ if (SystemUtils.IS_OS_WINDOWS || !(cloneInfo instanceof SshCloneInfo)) {
+ jobLogger.log("Retrieving submodules...");
+
+ git.clearArgs();
+ git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet");
+ if (cloneDepth != 0)
+ git.addArgs("--depth=" + cloneDepth);
+ git.execute(logger, logger).checkReturnCode();
+ } else {
+ /*
+ * We need to update submodules within a helper image in order to use our own .ssh folder.
+ * Specifying HOME env to change ~/.ssh folder does not have effect on Linux
+ */
+ Commandline cmd = newDocker();
+ String containerName = network + "-submodule-update-helper";
+ 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",
+ "submodule", "update", "--init", "--recursive", "--force", "--quiet");
+ if (cloneDepth != 0)
+ cmd.addArgs("--depth=" + cloneDepth);
+
+ jobLogger.log("Retrieving submodules with helper image...");
+
+ cmd.execute(logger, logger, null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process, String executionId) {
+ jobLogger.log("Stopping submodule update helper 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();
+ }
+ }
+
+ return true;
+ } catch (Exception e) {
+ String errorMessage = ExceptionUtils.getExpectedError(e);
+ if (errorMessage == null)
+ errorMessage = Throwables.getStackTraceAsString(e);
+ errorMessages.add("Step \"" + stepNames + "\" is failed: " + errorMessage);
+ return false;
+ }
} else {
- jobLogger.log("Running step #" + positionStr + "...");
-
ServerExecutable serverExecutable = (ServerExecutable) executable;
- PatternSet filePatternSet = new PatternSet(serverExecutable.getIncludeFiles(),
- serverExecutable.getExcludeFiles());
+
File filesDir = FileUtils.createTempDir();
try {
+ Collection<String> placeholders = serverExecutable.getPlaceholders();
+ Map<String, String> placeholderValues = readPlaceholderValues(hostBuildHome, placeholders);
+ PatternSet filePatterns = new PatternSet(
+ new HashSet<>(replacePlaceholders(serverExecutable.getIncludeFiles(), placeholderValues)),
+ new HashSet<>(replacePlaceholders(serverExecutable.getExcludeFiles(), placeholderValues)));
+
int baseLen = hostWorkspace.getAbsolutePath().length()+1;
- for (File file: filePatternSet.listFiles(hostWorkspace)) {
+ for (File file: filePatterns.listFiles(hostWorkspace)) {
try {
FileUtils.copyFile(file, new File(filesDir, file.getAbsolutePath().substring(baseLen)));
} catch (IOException e) {
@@ -706,13 +736,22 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
}
- jobContext.runServerStep(position, filesDir, jobLogger);
+ Map<String, byte[]> outputFiles = jobContext.runServerStep(position, filesDir, placeholderValues, jobLogger);
+
+ if (outputFiles != null) {
+ for (Map.Entry<String, byte[]> entry: outputFiles.entrySet()) {
+ FileUtils.writeByteArrayToFile(
+ new File(hostBuildHome, entry.getKey()),
+ entry.getValue());
+ }
+ }
+
return true;
} catch (Exception e) {
String errorMessage = ExceptionUtils.getExpectedError(e);
if (errorMessage == null)
errorMessage = Throwables.getStackTraceAsString(e);
- errorMessages.add("Step #" + positionStr + " is failed: " + errorMessage);
+ errorMessages.add("Step \"" + stepNames + "\" is failed: " + errorMessage);
return false;
} finally {
FileUtils.deleteDir(filesDir);
@@ -722,7 +761,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
@Override
public void skip(LeafExecutable executable, List<Integer> position) {
- jobLogger.log("Skipping step #" + KubernetesHelper.stringifyPosition(position) + "...");
+ jobLogger.log("Skipping step \"" + entryExecutable.getNamesAsString(position) + "\"...");
}
}, new ArrayList<>());
@@ -732,11 +771,9 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
jobLogger.log("Reporting job caches...");
- jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
+ jobManager.reportJobCaches(jobToken, getCacheInstances(hostCacheHome).keySet());
return null;
- } catch (IOException e) {
- throw new RuntimeException(e);
} finally {
if (hostHome.get() != null)
FileUtils.deleteDir(hostHome.get());
@@ -765,7 +802,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
cmd.addArgs(login.getRegistryUrl());
ByteArrayInputStream input;
try {
- input = new ByteArrayInputStream(login.getPassword().getBytes(StandardCharsets.UTF_8.name()));
+ input = new ByteArrayInputStream(login.getPassword().getBytes(UTF_8.name()));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index fb6378f540..19b5066f73 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
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 e136fa52d0..038e1523a7 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
@@ -55,6 +55,7 @@ import io.onedev.k8shelper.CommandExecutable;
import io.onedev.k8shelper.LeafVisitor;
import io.onedev.k8shelper.CompositeExecutable;
import io.onedev.k8shelper.ExecuteCondition;
+import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.k8shelper.LeafExecutable;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.Service;
@@ -86,7 +87,7 @@ 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 int POD_WATCH_TIMEOUT = 60;
private static final Logger logger = LoggerFactory.getLogger(KubernetesExecutor.class);
@@ -693,6 +694,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return map;
}
+ private String getContainerDisplayName(CompositeExecutable entryExecutable, String containerName) {
+ if (containerName.startsWith("step-")) {
+ List<Integer> position = KubernetesHelper.parsePosition(containerName.substring("step-".length()));
+ return "Step \"" + entryExecutable.getNamesAsString(position) + "\"";
+ } else {
+ return containerName;
+ }
+ }
+
private void execute(String jobToken, SimpleLogger jobLogger, Object executionContext) {
jobLogger.log("Checking cluster access...");
JobContext jobContext;
@@ -811,7 +821,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
List<Action> actions = new ArrayList<>();
CommandExecutable executable = new CommandExecutable((String) executionContext,
Lists.newArrayList("this does not matter"));
- actions.add(new Action(executable, ExecuteCondition.ALWAYS));
+ actions.add(new Action("test", executable, ExecuteCondition.ALWAYS));
entryExecutable = new CompositeExecutable(actions);
}
@@ -850,12 +860,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"name", containerName,
"image", image);
+ String positionStr = stringifyPosition(position);
if (baselineOsInfo.isLinux()) {
stepContainerSpec.put("command", Lists.newArrayList("sh"));
- stepContainerSpec.put("args", Lists.newArrayList(containerCommandHome + "/" + stringifyPosition(position) + ".sh"));
+ stepContainerSpec.put("args", Lists.newArrayList(containerCommandHome + "/" + positionStr + ".sh"));
} else {
stepContainerSpec.put("command", Lists.newArrayList("cmd"));
- stepContainerSpec.put("args", Lists.newArrayList("/c", containerCommandHome + "\\" + stringifyPosition(position) + ".bat"));
+ stepContainerSpec.put("args", Lists.newArrayList("/c", containerCommandHome + "\\" + positionStr + ".bat"));
}
stepContainerSpec.put("env", envs);
@@ -1009,10 +1020,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
* 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
+ if (error.isFatal()) {
+ return new Abort(getContainerDisplayName(entryExecutable, containerName)
+ + ": " + error.getMessage());
+ } else {
return new Abort(null);
+ }
} else if (getStartedContainers(containerStatusNodes).contains(containerName)) {
return new Abort(null);
} else {
@@ -1036,7 +1049,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
public Abort check(String nodeName, Collection<JsonNode> containerStatusNodes) {
ContainerError error = getContainerErrors(containerStatusNodes).get(containerName);
if (error != null) {
- String errorMessage = containerName + ": " + error.getMessage();
+ String errorMessage = getContainerDisplayName(entryExecutable, containerName)
+ + ": " + error.getMessage();
errorMessages.add(errorMessage);
/*
* We abort the watch with an exception for two reasons:
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 b64dcde658..0a0c60a60e 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
@@ -1,11 +1,13 @@
package io.onedev.server.plugin.executor.kubernetes;
+import static io.onedev.k8shelper.KubernetesHelper.readInt;
+import static io.onedev.k8shelper.KubernetesHelper.readString;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -27,7 +29,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
-import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.lang.SerializationUtils;
import com.google.common.base.Splitter;
@@ -40,6 +41,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TarUtils;
import io.onedev.k8shelper.CacheAllocationRequest;
import io.onedev.k8shelper.CacheInstance;
+import io.onedev.k8shelper.ServerExecutionResult;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobContext;
import io.onedev.server.buildspec.job.JobManager;
@@ -72,10 +74,7 @@ public class KubernetesResource {
context.reportJobWorkspace(jobWorkspace);
Map<String, Object> contextMap = new HashMap<>();
contextMap.put("actions", context.getActions());
- contextMap.put("retrieveSource", context.isRetrieveSource());
- contextMap.put("cloneDepth", context.getCloneDepth());
contextMap.put("projectName", context.getProjectName());
- contextMap.put("cloneInfo", context.getCloneInfo());
contextMap.put("commitHash", context.getCommitId().name());
return SerializationUtils.serialize((Serializable) contextMap);
}
@@ -106,21 +105,21 @@ public class KubernetesResource {
public Response runServerStep(InputStream is) {
File filesDir = FileUtils.createTempDir();
try {
- byte[] intBytes = new byte[4];
- if (IOUtils.readFully(is, intBytes) != intBytes.length)
- throw new ExplicitException("Invalid input stream to run server step");
- int length = ByteBuffer.wrap(intBytes).getInt();
+ int length = readInt(is);
List<Integer> stepPosition = new ArrayList<>();
- for (int i=0; i<length; i++) {
- if (IOUtils.readFully(is, intBytes) != intBytes.length)
- throw new ExplicitException("Invalid input stream to run server step");
- stepPosition.add(ByteBuffer.wrap(intBytes).getInt());
- }
-
+ for (int i=0; i<length; i++)
+ stepPosition.add(readInt(is));
+
+ Map<String, String> placeholderValues = new HashMap<>();
+ length = readInt(is);
+ for (int i=0; i<length; i++)
+ placeholderValues.put(readString(is), readString(is));
+
TarUtils.untar(is, filesDir);
List<String> logMessages = new ArrayList<>();
- jobManager.runServerStep(getJobToken(), stepPosition, filesDir, new SimpleLogger() {
+ Map<String, byte[]> outputFiles = jobManager.runServerStep(getJobToken(), stepPosition,
+ filesDir, placeholderValues, new SimpleLogger() {
@Override
public void log(String message) {
@@ -129,13 +128,8 @@ public class KubernetesResource {
});
- byte[] logBytes = SerializationUtils.serialize((Serializable) logMessages);
-
- /*
- * Send log statements back to job pod for logging as otherwise log statements
- * from command step and server step may be dis-ordered
- */
- return Response.ok(logBytes).build();
+ ServerExecutionResult result = new ServerExecutionResult(logMessages, outputFiles);
+ return Response.ok(SerializationUtils.serialize(result)).build();
} catch (Exception e) {
String errorMessage = ExceptionUtils.getExpectedError(e);
if (errorMessage == null)
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index f14f99cebc..0a563393cf 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
index 34baa41225..d985bad522 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
@@ -7,6 +7,7 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.apache.commons.lang.SerializationUtils;
@@ -39,7 +40,7 @@ public class PublishCheckstyleReportStep extends PublishReportStep {
public static final String VIOLATION_FILES = "violation-files";
- @Editable(order=100, description="Specify checkstyle result xml file relative to repository root, "
+ @Editable(order=100, description="Specify checkstyle result xml file relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>, "
+ "for instance, <tt>target/checkstyle-result.xml</tt>. "
+ "Refer to <a href='https://checkstyle.org/'>checkstyle documentation</a> "
+ "on how to generate the result xml file. Use * or ? for pattern match")
@@ -58,11 +59,11 @@ public class PublishCheckstyleReportStep extends PublishReportStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
CheckstyleReportData reportData = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<CheckstyleReportData>() {
@@ -136,6 +137,8 @@ public class PublishCheckstyleReportStep extends PublishReportStep {
OneDev.getInstance(Dao.class).persist(metric);
}
+
+ return null;
}
}
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
index 124e6da2c8..b8c4a1470a 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
@@ -11,7 +11,7 @@ public class PublishESLintReportStep extends PublishCheckstyleReportStep {
private static final long serialVersionUID = 1L;
- @Editable(order=100, description="Specify ESLint report file in checkstyle format relative to repository root. "
+ @Editable(order=100, description="Specify ESLint report file in checkstyle format relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "
+ "This file can be generated with ESLint option <tt>'-f checkstyle'</tt> and <tt>'-o'</tt>. "
+ "Use * or ? for pattern match")
@Interpolative(variableSuggester="suggestVariables")
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 13ee19cc96..a61235c18b 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
index d547c63c0f..81d2e7cef3 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
@@ -41,7 +41,7 @@ public class PublishCloverReportStep extends PublishReportStep {
public static final String TEST_COUNTS_DIR = "test-count";
- @Editable(order=100, description="Specify clover coverage xml report file relative to repository root, "
+ @Editable(order=100, description="Specify clover coverage xml report file relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>, "
+ "for instance, <tt>target/site/clover/clover.xml</tt>. "
+ "Refer to <a href='https://openclover.org/documentation'>OpenClover documentation</a> "
+ "on how to generate clover xml file. Use * or ? for pattern match")
@@ -60,11 +60,11 @@ public class PublishCloverReportStep extends PublishReportStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
CloverReportData reportData = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<CloverReportData>() {
@@ -214,6 +214,8 @@ public class PublishCloverReportStep extends PublishReportStep {
OneDev.getInstance(Dao.class).persist(metric);
}
+
+ return null;
}
}
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
index 0fd451336e..20e760505e 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
@@ -11,7 +11,7 @@ public class PublishJestCoverageReportStep extends PublishCloverReportStep {
private static final long serialVersionUID = 1L;
- @Editable(order=100, description="Specify Jest coverage report file in clover format relative to repository root, "
+ @Editable(order=100, description="Specify Jest coverage report file in clover format relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>, "
+ "for instance <tt>coverage/clover.xml</tt>. This file can be generated with Jest option <tt>'--coverage'</tt>. "
+ "Use * or ? for pattern match")
@Interpolative(variableSuggester="suggestVariables")
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index 00b0fdc2a8..a5f9e66a38 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
index ab207bb41a..d667435313 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.hibernate.validator.constraints.NotEmpty;
@@ -33,7 +34,7 @@ public class PublishJestTestReportStep extends PublishReportStep {
public static final String DIR = "jest-reports";
- @Editable(order=100, description="Specify Jest test result file in json format relative to repository root. "
+ @Editable(order=100, description="Specify Jest test result file in json format relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "
+ "This file can be generated via Jest option <tt>'--json'</tt> and <tt>'--outputFile'</tt>. Use * or ? for pattern match")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@@ -50,11 +51,11 @@ public class PublishJestTestReportStep extends PublishReportStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
JestTestReportData report = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<JestTestReportData>() {
@@ -95,7 +96,9 @@ public class PublishJestTestReportStep extends PublishReportStep {
metric.setNumOfTestSuites(report.getNumOfTestSuites());
metric.setTotalTestDuration(report.getTotalTestDuration());
OneDev.getInstance(Dao.class).persist(metric);
- }
+ }
+
+ return null;
}
}
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index e0840acc60..3be94a9ec3 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
index f198be6313..cec8632dd1 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
@@ -3,6 +3,7 @@ package io.onedev.server.plugin.report.markdown;
import java.io.File;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.hibernate.validator.constraints.NotEmpty;
@@ -28,7 +29,7 @@ public class PublishMarkdownReportStep extends PublishReportStep {
private String startPage;
- @Editable(order=1100, description="Specify start page of the report relative to repository root, for instance: <tt>manual/index.md</tt>")
+ @Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>, for instance: <tt>manual/index.md</tt>")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
public String getStartPage() {
@@ -41,11 +42,11 @@ public class PublishMarkdownReportStep extends PublishReportStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<Void>() {
@@ -74,6 +75,8 @@ public class PublishMarkdownReportStep extends PublishReportStep {
}
});
+
+ return null;
}
}
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
index 0e47bb7c28..755e56e0de 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
@@ -3,6 +3,7 @@ package io.onedev.server.plugin.report.markdown;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.hibernate.validator.constraints.NotEmpty;
@@ -47,11 +48,11 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
- return BuildSpec.suggestVariables(matchWith);
+ return BuildSpec.suggestVariables(matchWith, true, true);
}
@Override
- public void run(Build build, File workspace, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File workspace, SimpleLogger logger) {
if (build.getRequest() != null) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
@@ -72,6 +73,7 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
});
}
+ return null;
}
}
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index 845bdbcaff..e3ccb9add7 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/pom.xml b/server-product/pom.xml
index dc9edd69cc..5a96de5690 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
</parent>
<dependencies>
<dependency>