Merge ~r00ta/maas:lp-2056781-3.5 into maas:3.5

Proposed by Jacopo Rota
Status: Merged
Approved by: Jacopo Rota
Approved revision: ec51b479aa60b97388084dc902a9966f9759a360
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~r00ta/maas:lp-2056781-3.5
Merge into: maas:3.5
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/workflow/bootresource.py (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Jacopo Rota Approve
Review via email: mp+462292@code.launchpad.net

Commit message

fix: lp-2056781. no maximum attempts for the download-bootresourcefile activity in the sync-bootresources workflow

(cherry picked from commit 348e1da0f425f855be385cc9cb23c96162a111b0)

To post a comment you must log in.
Revision history for this message
Jacopo Rota (r00ta) wrote :

self-approving backport

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp-2056781-3.5 lp:~r00ta/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ec51b479aa60b97388084dc902a9966f9759a360

review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/workflow/bootresource.py b/src/maasserver/workflow/bootresource.py
index 9d9875c..5c6528e 100644
--- a/src/maasserver/workflow/bootresource.py
+++ b/src/maasserver/workflow/bootresource.py
@@ -225,7 +225,7 @@ class DownloadBootResourceWorkflow:
225 heartbeat_timeout=HEARTBEAT_TIMEOUT,225 heartbeat_timeout=HEARTBEAT_TIMEOUT,
226 cancellation_type=ActivityCancellationType.WAIT_CANCELLATION_COMPLETED,226 cancellation_type=ActivityCancellationType.WAIT_CANCELLATION_COMPLETED,
227 retry_policy=RetryPolicy(227 retry_policy=RetryPolicy(
228 maximum_attempts=max(2, len(input.source_list)),228 maximum_attempts=0, # No maximum attempts
229 maximum_interval=timedelta(seconds=60),229 maximum_interval=timedelta(seconds=60),
230 ),230 ),
231 )231 )

Subscribers

People subscribed via source and target branches