feat: UI方式下的「所有参数满足条件时执行」和「所有参数满足条件时不执行」转为Code 优化 #10930

TencentBlueKing · Sep 19, 2024 · 722ad93 · 722ad93
1 parent 464a54c
commit 722ad93
Showing 1 changed file with 39 additions and 51 deletions.
diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json b/src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json
@@ -1759,24 +1759,20 @@
               } ]
             },
             "if" : {
-              "type" : "object",
-              "additionalProperties" : {
-                "anyOf" : [ {
-                  "type" : "string"
-                }, {
-                  "type" : "object",
-                  "additionalProperties" : false,
-                  "required" : [ "value" ],
-                  "properties" : {
-                    "mode" : {
-                      "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
-                    },
-                    "params" : {
-                      "type" : "object"
-                    }
+              "oneOf" : [ {
+                "type" : "string"
+              }, {
+                "type" : "object",
+                "additionalProperties" : false,
+                "properties" : {
+                  "mode" : {
+                    "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
+                  },
+                  "params" : {
+                    "type" : "object"
                   }
-                } ]
-              }
+                }
+              } ]
             },
             "check-in" : {
               "$ref" : "#/definitions/check-in"
@@ -2495,24 +2491,20 @@
               }
             },
             "if" : {
-              "type" : "object",
-              "additionalProperties" : {
-                "anyOf" : [ {
-                  "type" : "string"
-                }, {
-                  "type" : "object",
-                  "additionalProperties" : false,
-                  "required" : [ "value" ],
-                  "properties" : {
-                    "mode" : {
-                      "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
-                    },
-                    "params" : {
-                      "type" : "object"
-                    }
+              "oneOf" : [ {
+                "type" : "string"
+              }, {
+                "type" : "object",
+                "additionalProperties" : false,
+                "properties" : {
+                  "mode" : {
+                    "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
+                  },
+                  "params" : {
+                    "type" : "object"
                   }
-                } ]
-              }
+                }
+              } ]
             },
             "steps" : {
               "$ref" : "#/definitions/steps"
@@ -2632,24 +2624,20 @@
               "maxLength" : 64
             },
             "if" : {
-              "type" : "object",
-              "additionalProperties" : {
-                "anyOf" : [ {
-                  "type" : "string"
-                }, {
-                  "type" : "object",
-                  "additionalProperties" : false,
-                  "required" : [ "value" ],
-                  "properties" : {
-                    "mode" : {
-                      "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
-                    },
-                    "params" : {
-                      "type" : "object"
-                    }
+              "oneOf" : [ {
+                "type" : "string"
+              }, {
+                "type" : "object",
+                "additionalProperties" : false,
+                "properties" : {
+                  "mode" : {
+                    "enum" : [ "RUN_WHEN_ALL_PARAMS_MATCH", "NOT_RUN_WHEN_ALL_PARAMS_MATCH" ]
+                  },
+                  "params" : {
+                    "type" : "object"
                   }
-                } ]
-              }
+                }
+              } ]
             },
             "with" : {
               "type" : "object"