MT#61223 build: fix release at trigger_copy_deps on trunk-next

Change-Id: I613364e1acab58556bd9d74684e541d4566fcabe
mprokop/trixie
Victor Seva 2 years ago
parent 2768edea92
commit d6d11a67db

@ -33,7 +33,7 @@ def build_release(self, pk):
except BuildRelease.DoesNotExist as exc: except BuildRelease.DoesNotExist as exc:
logger.warn("BuildRelease not found") logger.warn("BuildRelease not found")
raise self.retry(countdown=60 * 5, exc=exc) 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) release = "release-trunk-{}".format(instance.distribution)
else: else:
release = instance.release release = instance.release

@ -103,6 +103,12 @@ class BuildReleaseCreate(BaseTest):
) )
self.assertEqual(br.release, "trunk-next") self.assertEqual(br.release, "trunk-next")
self.assertEqual(br.distribution, "bookworm") 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): def test_get_simple_release(self):
val = get_simple_release("release-trunk-bookworm") val = get_simple_release("release-trunk-bookworm")

Loading…
Cancel
Save