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

[Alexsander de Souza]

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

ID must be unique within a namespace

[MAAS Lander (maas-lander)]

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

[Anton Troyanov (troyanov)]

jenkins: !test

[MAAS Lander (maas-lander)]

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

[Jacopo Rota (r00ta)]

LGTM

review: Approve

diff --git a/src/maasserver/workflow/bootresource.py b/src/maasserver/workflow/bootresource.py
index a1938d0..4c76a5e 100644
--- a/src/maasserver/workflow/bootresource.py
+++ b/src/maasserver/workflow/bootresource.py
@@ -242,7 +242,7 @@ class SyncBootResourcesWorkflow:
             return workflow.execute_child_workflow(
                 "download-bootresource",
                 res,
-                id=f"bootresource-download:{res.sha256[:12]}",
+                id=f"bootresource-download:{region or 'upstream'}:{res.sha256[:12]}",
                 execution_timeout=DOWNLOAD_TIMEOUT,
                 run_timeout=DOWNLOAD_TIMEOUT,
                 id_reuse_policy=WorkflowIDReusePolicy.TERMINATE_IF_RUNNING,