Skip to content

Commit 2fb5f49

Browse files
committed
Handle koji_build and bodhi_update retrigger from a main PR
Signed-off-by: Nikola Forró <nforro@redhat.com>
1 parent 686af4c commit 2fb5f49

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

packit_service/worker/handlers/distgit.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,9 @@ def get_branches(self) -> list[str]:
12351235
if self.data.event_type in (pagure.pr.Comment.event_type(),)
12361236
else self.dg_branch
12371237
)
1238+
if branch == "main":
1239+
# Koji doesn't recognize main, only rawhide
1240+
branch = "rawhide"
12381241
return [branch]
12391242

12401243
def get_trigger_type_description(self) -> str:

packit_service/worker/handlers/mixin.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,10 @@ class GetKojiBuildDataFromKojiServiceMixin(
353353
):
354354
@property
355355
def _dist_git_branch(self) -> str:
356-
return self.project.get_pr(self.data.pr_id).target_branch
356+
if (branch := self.project.get_pr(self.data.pr_id).target_branch) == "main":
357+
# Koji doesn't recognize main, only rawhide
358+
return "rawhide"
359+
return branch
357360

358361
@property
359362
def num_of_branches(self):

0 commit comments

Comments
 (0)