MAAS

Merge ~alexsander-souza/maas:lp2057979_fix_id_clash into maas:master

  1. Git
  2. lp:~alexsander-souza/maas
  3. lp2057979_fix_id_clash
  4. Merge into master
Proposed by Alexsander de Souza
Status: Merged
Approved by: Jacopo Rota
Approved revision: c1c91fcc5a5a199bb9ab3696b25559ffc69dbd1a
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~alexsander-souza/maas:lp2057979_fix_id_clash
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/workflow/bootresource.py (+1/-1)
Reviewer Review Type Date Requested Status
Jacopo Rota Approve
MAAS Lander Approve
Review via email: mp+462462@code.launchpad.net

Commit message

fix(bootresource): lp-2057979. Avoid workflow id clash.

ID must be unique within a namespace

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp2057979_fix_id_clash lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/4973/console
COMMIT: c1c91fcc5a5a199bb9ab3696b25559ffc69dbd1a

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

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

UNIT TESTS
-b lp2057979_fix_id_clash lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c1c91fcc5a5a199bb9ab3696b25559ffc69dbd1a

review: Approve
Revision history for this message
Jacopo Rota (r00ta) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/workflow/bootresource.py b/src/maasserver/workflow/bootresource.py
2index a1938d0..4c76a5e 100644
3--- a/src/maasserver/workflow/bootresource.py
4+++ b/src/maasserver/workflow/bootresource.py
5@@ -242,7 +242,7 @@ class SyncBootResourcesWorkflow:
6 return workflow.execute_child_workflow(
7 "download-bootresource",
8 res,
9- id=f"bootresource-download:{res.sha256[:12]}",
10+ id=f"bootresource-download:{region or 'upstream'}:{res.sha256[:12]}",
11 execution_timeout=DOWNLOAD_TIMEOUT,
12 run_timeout=DOWNLOAD_TIMEOUT,
13 id_reuse_policy=WorkflowIDReusePolicy.TERMINATE_IF_RUNNING,

Subscribers

People subscribed via source and target branches