Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions packit_service/worker/handlers/distgit.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from ogr.abstract import AuthMethod, PullRequest
from ogr.parsing import RepoUrl, parse_git_repo
from ogr.services.github import GithubService
from packit.config import Deployment, JobConfig, JobConfigTriggerType, JobType, aliases
from packit.config import Deployment, JobConfig, JobType, aliases
from packit.config.package_config import PackageConfig
from packit.exceptions import (
PackitCommandFailedError,
Expand Down Expand Up @@ -293,20 +293,6 @@ def sync_branch(
version := self.get_version_from_comment()
):
kwargs["versions"] = [version]
# check if there is a Koji build job that should trigger on PR merge
kwargs["warn_about_koji_build_triggering_bug"] = False
for job in self.package_config.get_job_views():
if job.type != JobType.koji_build:
continue
if job.trigger != JobConfigTriggerType.commit:
continue
if branch not in aliases.get_branches(
*job.dist_git_branches,
default_dg_branch="rawhide",
):
continue
kwargs["warn_about_koji_build_triggering_bug"] = True
break
downstream_pr, additional_prs = self.packit_api.sync_release(**kwargs)
except PackitDownloadFailedException as ex:
# the archive has not been uploaded to PyPI yet
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/test_new_hotness_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model):
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down Expand Up @@ -411,7 +410,6 @@ def test_new_hotness_update_non_git(new_hotness_update, sync_release_model_non_g
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down
3 changes: 0 additions & 3 deletions tests/integration/test_pr_comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -2977,7 +2977,6 @@ def _get_project(url, *_, **__):
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down Expand Up @@ -3148,7 +3147,6 @@ def _get_project(url, *_, **__):
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down Expand Up @@ -3345,7 +3343,6 @@ def _get_project(url, *_, **__):
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down
7 changes: 0 additions & 7 deletions tests/integration/test_release_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ def test_dist_git_push_release_handle(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down Expand Up @@ -390,7 +389,6 @@ def test_dist_git_push_release_handle_fast_forward_branches(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {"rawhide": second_pr})).once()
flexmock(PackitAPI).should_receive("clean")

Expand Down Expand Up @@ -538,7 +536,6 @@ def test_dist_git_push_release_handle_multiple_branches(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()

flexmock(ProposeDownstreamJobHelper).should_receive(
Expand Down Expand Up @@ -694,7 +691,6 @@ def test_dist_git_push_release_handle_one_failed(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).once()
flexmock(ProposeDownstreamJobHelper).should_receive(
"report_status_for_branch",
Expand All @@ -718,7 +714,6 @@ def test_dist_git_push_release_handle_one_failed(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_raise(Exception, f"Failed {model.branch}").once()
flexmock(ProposeDownstreamJobHelper).should_receive(
"report_status_for_branch",
Expand Down Expand Up @@ -984,7 +979,6 @@ def test_retry_propose_downstream_task(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_raise(
PackitDownloadFailedException,
"Failed to download source from example.com",
Expand Down Expand Up @@ -1099,7 +1093,6 @@ def test_dont_retry_propose_downstream_task(
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_raise(
PackitDownloadFailedException,
"Failed to download source from example.com",
Expand Down
1 change: 0 additions & 1 deletion tests/unit/test_steve.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ def test_process_message(event, private, enabled_private_namespaces, success):
pr_description_footer=DistgitAnnouncement.get_announcement(),
add_new_sources=True,
fast_forward_merge_branches=set(),
warn_about_koji_build_triggering_bug=False,
).and_return((pr, {})).times(1 if success else 0)
flexmock(shutil).should_receive("rmtree").with_args("")

Expand Down
Loading