feature: bamboo-pipeline 支持流程级别网关配置

runtime/bamboo-pipeline/pipeline/__init__.py

@@ -13,4 +13,4 @@
 
 default_app_config = "pipeline.apps.PipelineConfig"
 
-__version__ = "3.27.0"
+__version__ = "3.28.0"

runtime/bamboo-pipeline/pipeline/eri/apps.py

@@ -44,7 +44,7 @@ def ready(self):
                 pipeline_exclusive_gateway_expr_func_text = getattr(
                     settings, "PIPELINE_EXCLUSIVE_GATEWAY_EXPR_FUNC_TEXT", "1==1"
                 )
-                check_result = pipeline_exclusive_gateway_expr_func(pipeline_exclusive_gateway_expr_func_text, {})
+                check_result = pipeline_exclusive_gateway_expr_func(pipeline_exclusive_gateway_expr_func_text, {}, {})
                 if not check_result:
                     raise ConfigValidationError("config validate error, the expr func return False")
 

runtime/bamboo-pipeline/pipeline/eri/imp/node.py

@@ -26,7 +26,8 @@
     EmptyStartEvent,
     EmptyEndEvent,
     ExecutableEndEvent,
-    Condition, DefaultCondition,
+    Condition,
+    DefaultCondition,
 )
 
 from pipeline.eri.models import Node as DBNode
@@ -67,6 +68,7 @@ def _get_node(self, node: DBNode):
                 type=NodeType.ExclusiveGateway,
                 conditions=[Condition(**c) for c in node_detail["conditions"]],
                 default_condition=DefaultCondition(**default_condition) if default_condition else None,
+                extra_info=node_detail.get("extra_info"),
                 **common_args
             )
 
@@ -82,6 +84,7 @@ def _get_node(self, node: DBNode):
                 converge_gateway_id=node_detail["converge_gateway_id"],
                 conditions=[Condition(**c) for c in node_detail["conditions"]],
                 default_condition=DefaultCondition(**default_condition) if default_condition else None,
+                extra_info=node_detail.get("extra_info"),
                 **common_args
             )
 

runtime/bamboo-pipeline/pipeline/eri/runtime.py

@@ -192,6 +192,8 @@ def _gen_gateway_node(self, gateway: dict, pipeline: dict, root_id: str, parent_
                 if default_condition
                 else None
             )
+            if gateway.get("extra_info"):
+                detail["extra_info"] = gateway["extra_info"]
         elif gateway["type"] == NodeType.ParallelGateway.value:
             detail["converge_gateway_id"] = gateway["converge_gateway_id"]
 
@@ -215,6 +217,8 @@ def _gen_gateway_node(self, gateway: dict, pipeline: dict, root_id: str, parent_
                 if default_condition
                 else None
             )
+            if gateway.get("extra_info"):
+                detail["extra_info"] = gateway["extra_info"]
             detail["converge_gateway_id"] = gateway["converge_gateway_id"]
         elif gateway["type"] == NodeType.ConvergeGateway.value:
             pass

runtime/bamboo-pipeline/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bamboo-pipeline"
-version = "3.27.0"
+version = "3.28.0"
 description = "runtime for bamboo-engine base on Django and Celery"
 authors = ["homholueng <[email protected]>"]
 license = "MIT"
@@ -16,7 +16,7 @@ requests = "^2.22.0"
 django-celery-beat = "^2.1.0"
 Mako = "^1.1.4"
 pytz = "2019.3"
-bamboo-engine = "2.8.1"
+bamboo-engine = "2.9.0"
 jsonschema = "^2.5.1"
 ujson = "4.1.*"
 pyparsing = "^2.2.0"