From d6d11a67db1117138999242143f0679c3d3a14d8 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 14 Oct 2024 16:52:07 +0200 Subject: [PATCH] MT#61223 build: fix release at trigger_copy_deps on trunk-next Change-Id: I613364e1acab58556bd9d74684e541d4566fcabe --- build/tasks.py | 2 +- build/test/test_next.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/tasks.py b/build/tasks.py index d163400..f0da68b 100644 --- a/build/tasks.py +++ b/build/tasks.py @@ -33,7 +33,7 @@ def build_release(self, pk): except BuildRelease.DoesNotExist as exc: logger.warn("BuildRelease not found") raise self.retry(countdown=60 * 5, exc=exc) - if instance.release == "trunk": + if instance.release in ["trunk", "trunk-next"]: release = "release-trunk-{}".format(instance.distribution) else: release = instance.release diff --git a/build/test/test_next.py b/build/test/test_next.py index 687f865..fdf0d5e 100644 --- a/build/test/test_next.py +++ b/build/test/test_next.py @@ -103,6 +103,12 @@ class BuildReleaseCreate(BaseTest): ) self.assertEqual(br.release, "trunk-next") self.assertEqual(br.distribution, "bookworm") + build_resume.delay.assert_not_called() + trigger_copy_deps.assert_called_once_with( + internal=True, + release="release-trunk-bookworm", + release_uuid=br.uuid, + ) def test_get_simple_release(self): val = get_simple_release("release-trunk-bookworm")