The Unified and Autonomous Development Platform
feat: Able to mark step as optional (OD-2429)
Robin Shen2a1c52da8d9d
diff --git a/pom.xml b/pom.xmlindex 0251ff0669..24b973cc4c 100644--- a/pom.xml+++ b/pom.xml@@ -637,7 +637,7 @@</repositories><properties><commons.version>3.0.11</commons.version>- <agent.version>2.2.13</agent.version>+ <agent.version>2.2.14</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex a7bd392eaf..5777885217 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@@ -2293,4 +2293,23 @@ public class BuildSpec implements Serializable, Validatable {}}+ @SuppressWarnings("unused")+ private void migrate40(VersionedYamlDoc doc, Stack<Integer> versions) {+ migrateSteps(doc, versions, stepsNode -> {+ for (var stepNode: stepsNode.getValue()) {+ var stepMappingNode = (MappingNode) stepNode;+ for (var itStepTuple = stepMappingNode.getValue().iterator(); itStepTuple.hasNext();) {+ var stepTuple = itStepTuple.next();+ var keyNode = (ScalarNode) stepTuple.getKeyNode();+ if (keyNode.getValue().equals("condition")) {+ var valueNode = (ScalarNode) stepTuple.getValueNode();+ if (valueNode.getValue().equals("ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL"))+ valueNode.setValue("SUCCESSFUL");+ }+ }+ stepMappingNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "optional"), new ScalarNode(Tag.STR, "false")));+ }+ });+ }+}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.javaindex ae3dd9dda4..e7c8d5f3a1 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@@ -1,5 +1,7 @@package io.onedev.server.buildspec.step;+import static io.onedev.k8shelper.ExecuteCondition.SUCCESSFUL;+import java.io.Serializable;import javax.validation.constraints.NotNull;@@ -19,12 +21,12 @@ public abstract class Step implements Serializable {private static final long serialVersionUID = 1L;- private ExecuteCondition condition = ExecuteCondition.ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL;-- public abstract StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination);-private String name;+ private ExecuteCondition condition = SUCCESSFUL;++ private boolean optional;+@Editable(order=10)@NotEmptypublic String getName() {@@ -35,22 +37,36 @@ public abstract class Step implements Serializable {this.name = name;}- @Editable(order=10000, description="Under which condition this step should run")+ @Editable(order=10000, description="Under which condition this step should run. <b>Successful</b> means all " ++ "non-optional steps running before this step are successful")@NotNullpublic ExecuteCondition getCondition() {return condition;}-+public void setCondition(ExecuteCondition condition) {this.condition = condition;}+ @Editable(order=10100, description="Whether or not this step is optional. Execution failure of an optional " ++ "step will not cause the build to fail, and successful condition of subsequent steps will not " ++ "take optional step into account")+ public boolean isOptional() {+ return optional;+ }++ public void setOptional(boolean optional) {+ this.optional = optional;+ }+public Action getAction(String name, Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination) {- return new Action(name, getFacade(build, jobExecutor, jobToken, paramCombination), condition);+ return new Action(name, getFacade(build, jobExecutor, jobToken, paramCombination), condition, isOptional());}public Action getAction(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination) {return getAction(name, build, jobExecutor, jobToken, paramCombination);}+ public abstract StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex a291b72a54..d61159cc6c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -10,7 +10,7 @@</span></div></form>- <a wicket:id="addProject" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Add project"><wicket:svg href="plus" class="icon"/></a>+ <a wicket:id="addProject" class="btn btn-primary btn-icon flex-shrink-0 ml-3"><wicket:svg href="plus" class="icon"/></a></div><div class="operations mb-4"><a wicket:id="showSavedQueries" class="show-saved-queries text-gray d-inline-block mb-2 mr-4">diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex 663ff5c28b..024dd65e32 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -148,6 +148,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Auto Spec", "自动规范");m.put("Auto update check is performed by requesting an image in your browser from onedev.io indicating new version availability, with color indicating severity of the update. It works the same way as how gravatar requests avatar images. If disabled, you are highly recommended to check update manually from time to time (can be done via help menu on left bottom of the screen) to see if there are any security/critical fixes","自动更新检查通过从 onedev.io 请求一个图像来完成,该图像会指示新版本的可用性,颜色表示更新的严重程度。其工作方式与 gravatar 请求头像图片相同。如果禁用,强烈建议你定期手动检查更新(可通过屏幕左下角的帮助菜单执行),以确保获得安全/关键修复");+ m.put("Auto-discovered executor", "自动发现的执行器");m.put("Available Choices", "可选项");m.put("Avatar", "头像");m.put("Avatar Service Url", "头像服务地址");@@ -578,6 +579,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Filter", "过滤");m.put("Filter Issues", "过滤工单");m.put("Finish", "完成");+ m.put("First applicable executor", "第一个适用的执行器");m.put("Fix Type", "修复类型");m.put("Float", "浮点数");m.put("For a particular project, the first matching entry will be used", "对于特定项目,第一个匹配的条目将被使用");@@ -722,7 +724,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Ignore this param", "忽略此参数");m.put("Ignore trailing", "忽略后缀");m.put("Ignored Licenses", "忽略的许可证");- m.put("Image", "图片");+ m.put("Image", "容器镜像");m.put("Imap Ssl Setting", "IMAP SSL 设置");m.put("Imap With Ssl", "IMAP 使用 SSL");m.put("Implicit SSL", "隐式 SSL");@@ -1091,6 +1093,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("OpenSSH public key begins with 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'ssh-ed25519', '[email protected]', or '[email protected]'","OpenSSH 公钥以 'ssh-rsa'、'ecdsa-sha2-nistp256'、'ecdsa-sha2-nistp384'、'ecdsa-sha2-nistp521'、'ssh-ed25519'、'[email protected]' 或 '[email protected]' 开头");m.put("Operations", "操作");+ m.put("Optional", "可选");m.put("Optionally Specify project to create issue in. Leave empty to create in current project","可选择指定要在其中创建工单的项目。留空则在当前项目中创建");m.put("Optionally add new users to specified default group", "可选择将新用户添加到指定的默认组");@@ -2184,7 +2187,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Undefined Field Resolution", "未定义字段解析");m.put("Undefined Field Value Resolution", "未定义字段值解析");m.put("Undefined State Resolution", "未定义状态解析");- m.put("Under which condition this step should run", "此步骤应在何种条件下运行");m.put("Unified", "统一");m.put("Unlimited", "无限制");m.put("Unspecified", "未指定");@@ -2361,8 +2363,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{0} commits", "{0} 个提交");m.put("{0} files", "{0} 个文件");m.put("{0} tags", "{0} 个标签");- m.put("Auto-discovered executor", "自动发现的执行器");- m.put("First applicable executor", "第一个适用的执行器");+ m.put("Under which condition this step should run. <b>Successful</b> means all non-optional steps running before this step are successful",+ "在什么条件下应运行此步骤。<b>成功</b>表示在此步骤之前运行的所有非可选步骤都已成功");+ m.put("Whether or not this step is optional. Execution failure of an optional step will not cause the build to fail, and execute condition of subsequent steps will not take optional step into account",+ "此步骤是否为可选。可选步骤执行失败不会导致构建失败,后续步骤的执行条件也不会将可选步骤计算在内");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");@@ -2389,7 +2393,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("service", "服务");m.put("step template", "步骤模板");m.put("property", "属性");- m.put("All previous steps were successful", "所有前面步骤都成功");+ m.put("Successful", "成功");m.put("Always", "总是");m.put("Never", "从不");}diff --git a/server-ee b/server-eeindex 963c6f7f6a..22c8861eb4 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 963c6f7f6a33f6f1b2cb52460f32309a67352e85+Subproject commit 22c8861eb4c47ba5d033b9d1cdb0b27563f94feddiff --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.javaindex 854003ff8c..73c2ce0ad3 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@@ -52,6 +52,7 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;import static com.google.common.collect.Lists.newArrayList;+import static io.onedev.k8shelper.ExecuteCondition.ALWAYS;import static io.onedev.k8shelper.KubernetesHelper.*;import static io.onedev.k8shelper.RegistryLoginFacade.merge;import static io.onedev.server.util.CollectionUtils.newHashMap;@@ -932,7 +933,7 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwarList<Action> actions = new ArrayList<>();CommandFacade facade = new CommandFacade((String) executionContext, null, null,"this does not matter", new HashMap<>(), false);- actions.add(new Action("test", facade, ExecuteCondition.ALWAYS));+ actions.add(new Action("test", facade, ALWAYS, false));entryFacade = new CompositeFacade(actions);}