The Unified and Autonomous Development Platform
feat: Add support for retrieving child steps in CompositeStep
Robin Shen7e27994b4f33
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.javaindex 0bddd7a24d..46d3eeb202 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CompositeStep.java@@ -3,10 +3,12 @@ package io.onedev.server.buildspec.step;import io.onedev.k8shelper.Action;import io.onedev.k8shelper.CompositeFacade;import io.onedev.k8shelper.StepFacade;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import java.util.ArrayList;import java.util.List;public abstract class CompositeStep extends Step {@@ -19,7 +21,15 @@ public abstract class CompositeStep extends Step {return new CompositeFacade(getActions(build, jobExecutor, jobToken, paramCombination));}- protected abstract List<Action> getActions(Build build, JobExecutor jobExecutor, String jobToken,- ParamCombination paramCombination);+ /** Child step definitions, available without creating execution facades. */+ public abstract List<Step> getSteps(BuildSpec buildSpec);++ protected List<Action> getActions(Build build, JobExecutor jobExecutor, String jobToken,+ ParamCombination paramCombination) {+ List<Action> actions = new ArrayList<>();+ for (var step : getSteps(build.getSpec()))+ actions.add(step.getAction(build, jobExecutor, jobToken, paramCombination));+ return actions;+ }}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.javaindex e22fa47eb1..48e6b6c955 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@@ -107,6 +107,12 @@ public class UseTemplateStep extends CompositeStep {return new ArrayList<>();}+ @Override+ public List<Step> getSteps(BuildSpec buildSpec) {+ var template = buildSpec.getStepTemplateMap().get(templateName);+ return template != null ? template.getSteps() : List.of();+ }+@Overrideprotected List<Action> getActions(Build build, JobExecutor jobExecutor, String jobToken,ParamCombination paramCombination) {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.javaindex cd183710a6..b29343a345 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@@ -80,6 +80,8 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.step.CompositeStep;+import io.onedev.server.buildspec.step.UseTemplateStep;import io.onedev.server.buildspecmodel.inputspec.Input;import io.onedev.server.buildspecmodel.inputspec.SecretInput;import io.onedev.server.cluster.ClusterService;@@ -857,21 +859,20 @@ public class Build extends ProjectBelongingvar position = JobHelper.parseStepPosition(stage.substring(5));var steps = getJob().getSteps();var names = new ArrayList<String>();+ boolean repeated = false;for (int depth = 0; depth < position.size(); depth++) {int index = position.get(depth);- if (steps.isEmpty() || index < 0 || (depth == 0 && index >= steps.size()))+ if (steps.isEmpty() || index < 0 || (!repeated && index >= steps.size()))return stage;// Template parameter combinations repeat the template's action list.var step = steps.get(index % steps.size());int repeat = index / steps.size() + 1;names.add(step.getName() + (repeat > 1 ? " (" + repeat + ")" : ""));if (depth < position.size() - 1) {- if (!(step instanceof io.onedev.server.buildspec.step.UseTemplateStep templateStep))+ if (!(step instanceof CompositeStep compositeStep))return stage;- var template = getSpec().getStepTemplateMap().get(templateStep.getTemplateName());- if (template == null)- return stage;- steps = template.getSteps();+ steps = compositeStep.getSteps(getSpec());+ repeated = step instanceof UseTemplateStep;}}return String.join(" -> ", names);diff --git a/server-ee b/server-eeindex e37cc1e212..124d93be0c 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit e37cc1e212c7fa1844c151070cae67900e653cba+Subproject commit 124d93be0c9cfa181ef242810aa12798fae0f14d