From dac7ff11137acf87597b6c5f34e8a8e599856a58 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Mon, 8 Jan 2024 17:32:17 +0800
Subject: [PATCH] minor: release 3.29.2

---
 runtime/bamboo-pipeline/pipeline/__init__.py              | 2 +-
 .../bamboo-pipeline/pipeline/contrib/rollback/handler.py  | 8 ++++++--
 runtime/bamboo-pipeline/poetry.lock                       | 4 ++--
 runtime/bamboo-pipeline/pyproject.toml                    | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/runtime/bamboo-pipeline/pipeline/__init__.py b/runtime/bamboo-pipeline/pipeline/__init__.py
index 023c5a7..0db56ad 100644
--- 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.1"
+__version__ = "3.29.2"
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/rollback/handler.py b/runtime/bamboo-pipeline/pipeline/contrib/rollback/handler.py
index 6e74ce1..4be7f5d 100644
--- a/runtime/bamboo-pipeline/pipeline/contrib/rollback/handler.py
+++ b/runtime/bamboo-pipeline/pipeline/contrib/rollback/handler.py
@@ -245,8 +245,12 @@ def get_allowed_rollback_node_id_list(self, start_node_id, **options):
         # 如果开启了token跳过检查这个选项，那么将返回所有运行过的节点作为回滚范围
         if options.get("skip_check_token", False):
             node_map = self.get_allowed_rollback_node_map()
-            node_map.pop(start_node_id, Node)
-            return list(node_map.keys())
+            service_activity_node_list = [
+                node_id
+                for node_id, node_detail in node_map.items()
+                if node_detail["type"] == PE.ServiceActivity and node_id != start_node_id
+            ]
+            return service_activity_node_list
         return super(AnyRollbackHandler, self).get_allowed_rollback_node_id_list(start_node_id, **options)
 
     def retry_rollback_failed_node(self, node_id, retry_data):
diff --git a/runtime/bamboo-pipeline/poetry.lock b/runtime/bamboo-pipeline/poetry.lock
index 763b430..2cde3df 100644
--- a/runtime/bamboo-pipeline/poetry.lock
+++ b/runtime/bamboo-pipeline/poetry.lock
@@ -57,7 +57,7 @@ tests_no_zope = ["hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist", "c
 
 [[package]]
 name = "bamboo-engine"
-version = "2.10.1"
+version = "2.10.2"
 description = "Bamboo-engine is a general-purpose workflow engine"
 category = "main"
 optional = false
@@ -746,7 +746,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 [metadata]
 lock-version = "1.1"
 python-versions = ">= 3.6, < 4"
-content-hash = "7374f226043a63c6b79889cffe98b434ad8b737e7d9a2cc33f6f3243e164e6d5"
+content-hash = "120e412f8ba95fcebb08c720255fe9ff4c8fa17681a9eee4937e799a4512c1cf"
 
 [metadata.files]
 amqp = []
diff --git a/runtime/bamboo-pipeline/pyproject.toml b/runtime/bamboo-pipeline/pyproject.toml
index 7f56b40..a026b0e 100644
--- a/runtime/bamboo-pipeline/pyproject.toml
+++ b/runtime/bamboo-pipeline/pyproject.toml
@@ -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.1"
+bamboo-engine = "^2.10.2"
 jsonschema = "^2.5.1"
 ujson = "4.1.*"
 pyparsing = "^2.2.0"