Ensure integration queue branch is deleted as well

scality · Jan 26, 2024 · 6755b41 · 6755b41
1 parent fd04a4b
commit 6755b41
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bert_e/workflow/gitwaterflow/branches.py b/bert_e/workflow/gitwaterflow/branches.py
@@ -747,10 +747,13 @@ def delete(self):
         """Delete the queues entirely."""
 
         for branch in self._queues.values():
-            # TODO: Review if QueueIntegrationBranch should be removed as well
             queue: QueueBranch = branch[QueueBranch]
             queue.dst_branch.checkout()
             queue.remove(do_push=True)
+            queue_integration: QueueIntegrationBranch | None = branch.get(
+                QueueIntegrationBranch)
+            if queue_integration:
+                queue_integration.remove(do_push=True)
 
 
 class BranchCascade(object):