Skip to content

The Unified and Autonomous Development Platform

feat: remove "options" property from run container step (#1453)

Robin Shen6a6b5d637544
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 4ef4ec9330..3b42d3fcc2 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
@@ -1648,5 +1648,45 @@ public class BuildSpec implements Serializable, Validatable {
}
}
}
+
+ private void migrate24_steps(SequenceNode stepsNode) {
+ for (var itStepNode = stepsNode.getValue().iterator(); itStepNode.hasNext();) {
+ MappingNode stepNode = (MappingNode) itStepNode.next();
+ if (stepNode.getTag().getValue().equals("!RunContainerStep")) {
+ for (var itStepNodeTuple = stepNode.getValue().iterator(); itStepNodeTuple.hasNext();) {
+ String stepNodeTupleKey = ((ScalarNode)itStepNodeTuple.next().getKeyNode()).getValue();
+ if (stepNodeTupleKey.equals("opts"))
+ itStepNodeTuple.remove();
+ }
+ }
+ }
+ }
+
+ private void migrate24(VersionedYamlDoc doc, Stack<Integer> versions) {
+ 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"))
+ migrate24_steps((SequenceNode) jobTuple.getValueNode());
+ }
+ }
+ } 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"))
+ migrate24_steps((SequenceNode)stepTemplateTuple.getValueNode());
+ }
+ }
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
index 89b885931b..8a314f3948 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
@@ -28,8 +28,6 @@ public class RunContainerStep extends Step {
private static final long serialVersionUID = 1L;
private String image;
-
- private String opts;
private String args;
@@ -49,7 +47,7 @@ public class RunContainerStep extends Step {
Map<String, String> mountMap = new HashMap<>();
for (VolumeMount mount: getVolumeMounts())
mountMap.put(mount.getSourcePath(), mount.getTargetPath());
- return new RunContainerFacade(getImage(), getOpts(), getArgs(), envMap, getWorkingDir(), mountMap, isUseTTY());
+ return new RunContainerFacade(getImage(), null, getArgs(), envMap, getWorkingDir(), mountMap, isUseTTY());
}
@Editable(order=100, description="Specify container image to run")
@@ -63,16 +61,6 @@ public class RunContainerStep extends Step {
this.image = image;
}
- @Editable(order=150, name="Options", description = "Optionally specify space-separated options to run container")
- @Interpolative(variableSuggester = "suggestVariables")
- public String getOpts() {
- return opts;
- }
-
- public void setOpts(String opts) {
- this.opts = opts;
- }
-
@Editable(order=200, name="Arguments", description="Optionally specify container arguments separated by space. "
+ "Single argument containing space should be quoted")
@Interpolative(variableSuggester="suggestVariables")