Merge pull request #221 from hanshuaikang/feature/release_v3_29_2

minor: release 3.29.2
TencentBlueKing · Jan 8, 2024 · 54409dd · 54409dd
2 parents 3898ac4 + dac7ff1
commit 54409dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 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.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
@@ -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
diff --git 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"