Merge pull request #208 from hanshuaikang/minor/release_bamboo_pipeli…

…ne_3_29_0 minor: release bamboo_pipeline 3.29.0
TencentBlueKing · Dec 6, 2023 · 1335400 · 1335400
2 parents 3294ee7 + e574447
commit 1335400
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/runtime/bamboo-pipeline/pipeline/__init__.py b/runtime/bamboo-pipeline/pipeline/__init__.py
@@ -13,4 +13,4 @@
 
 default_app_config = "pipeline.apps.PipelineConfig"
 
-__version__ = "3.29.0rc4"
+__version__ = "3.29.0"
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/plugin_execute/api.py b/runtime/bamboo-pipeline/pipeline/contrib/plugin_execute/api.py
@@ -16,8 +16,8 @@
 
 
 @ensure_return_pipeline_contrib_api_result
-def run(component_code: str, version: str, inputs: dict, contexts: dict, runtime_attr: dict = None):
-    task_id = PluginExecuteHandler.run(component_code, version, inputs, contexts, runtime_attr)
+def run(component_code: str, version: str, inputs: dict, contexts: dict, runtime_attrs: dict = None):
+    task_id = PluginExecuteHandler.run(component_code, version, inputs, contexts, runtime_attrs)
     return task_id
 
 
@@ -37,5 +37,5 @@ def forced_fail(task_id):
 
 
 @ensure_return_pipeline_contrib_api_result
-def retry(task_id: int, inputs: dict = None, context: dict = None, runtime_attr: dict = None):
-    PluginExecuteHandler.retry_node(task_id, inputs, context, runtime_attr)
+def retry(task_id: int, inputs: dict = None, contexts: dict = None, runtime_attrs: dict = None):
+    PluginExecuteHandler.retry_node(task_id, inputs, contexts, runtime_attrs)
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/plugin_execute/handler.py b/runtime/bamboo-pipeline/pipeline/contrib/plugin_execute/handler.py
@@ -84,6 +84,7 @@ def get_state(cls, task_id):
             "invoke_count": plugin_execute_task.invoke_count,
             "inputs": plugin_execute_task.inputs,
             "outputs": plugin_execute_task.outputs,
+            "callback_data": plugin_execute_task.callback_data,
             "contexts": plugin_execute_task.contexts,
             "runtime_attrs": plugin_execute_task.runtime_attrs,
             "create_at": plugin_execute_task.created_at,

diff --git a/runtime/bamboo-pipeline/poetry.lock b/runtime/bamboo-pipeline/poetry.lock
diff --git a/runtime/bamboo-pipeline/pyproject.toml b/runtime/bamboo-pipeline/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bamboo-pipeline"
-version = "3.29.0rc4"
+version = "3.29.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.10.0rc4"
+bamboo-engine = "2.10.0"
 jsonschema = "^2.5.1"
 ujson = "4.1.*"
 pyparsing = "^2.2.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@

		default_app_config = "pipeline.apps.PipelineConfig"

		__version__ = "3.29.0rc4"
		__version__ = "3.29.0"