Skip to content

Commit 0fe7d76

Browse files
Revert "Check if sync_release PR should warn about koji_build triggering bug" (#3084)
Revert "Check if `sync_release` PR should warn about `koji_build` triggering bug" This reverts commit c35b238. Fixes #2537. Merge before packit/packit#2708. Reviewed-by: gemini-code-assist[bot] Reviewed-by: Laura Barcziová
2 parents 586b4fd + 87d5842 commit 0fe7d76

5 files changed

Lines changed: 1 addition & 28 deletions

File tree

packit_service/worker/handlers/distgit.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from ogr.abstract import AuthMethod, PullRequest
1919
from ogr.parsing import RepoUrl, parse_git_repo
2020
from ogr.services.github import GithubService
21-
from packit.config import Deployment, JobConfig, JobConfigTriggerType, JobType, aliases
21+
from packit.config import Deployment, JobConfig, JobType, aliases
2222
from packit.config.package_config import PackageConfig
2323
from packit.exceptions import (
2424
PackitCommandFailedError,
@@ -293,20 +293,6 @@ def sync_branch(
293293
version := self.get_version_from_comment()
294294
):
295295
kwargs["versions"] = [version]
296-
# check if there is a Koji build job that should trigger on PR merge
297-
kwargs["warn_about_koji_build_triggering_bug"] = False
298-
for job in self.package_config.get_job_views():
299-
if job.type != JobType.koji_build:
300-
continue
301-
if job.trigger != JobConfigTriggerType.commit:
302-
continue
303-
if branch not in aliases.get_branches(
304-
*job.dist_git_branches,
305-
default_dg_branch="rawhide",
306-
):
307-
continue
308-
kwargs["warn_about_koji_build_triggering_bug"] = True
309-
break
310296
downstream_pr, additional_prs = self.packit_api.sync_release(**kwargs)
311297
except PackitDownloadFailedException as ex:
312298
# the archive has not been uploaded to PyPI yet

tests/integration/test_new_hotness_update.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model):
232232
pr_description_footer=DistgitAnnouncement.get_announcement(),
233233
add_new_sources=True,
234234
fast_forward_merge_branches=set(),
235-
warn_about_koji_build_triggering_bug=False,
236235
).and_return((pr, {})).once()
237236
flexmock(PackitAPI).should_receive("clean")
238237

@@ -411,7 +410,6 @@ def test_new_hotness_update_non_git(new_hotness_update, sync_release_model_non_g
411410
pr_description_footer=DistgitAnnouncement.get_announcement(),
412411
add_new_sources=True,
413412
fast_forward_merge_branches=set(),
414-
warn_about_koji_build_triggering_bug=False,
415413
).and_return((pr, {})).once()
416414
flexmock(PackitAPI).should_receive("clean")
417415

tests/integration/test_pr_comment.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2977,7 +2977,6 @@ def _get_project(url, *_, **__):
29772977
pr_description_footer=DistgitAnnouncement.get_announcement(),
29782978
add_new_sources=True,
29792979
fast_forward_merge_branches=set(),
2980-
warn_about_koji_build_triggering_bug=False,
29812980
).and_return((pr, {})).once()
29822981
flexmock(PackitAPI).should_receive("clean")
29832982

@@ -3148,7 +3147,6 @@ def _get_project(url, *_, **__):
31483147
pr_description_footer=DistgitAnnouncement.get_announcement(),
31493148
add_new_sources=True,
31503149
fast_forward_merge_branches=set(),
3151-
warn_about_koji_build_triggering_bug=False,
31523150
).and_return((pr, {})).once()
31533151
flexmock(PackitAPI).should_receive("clean")
31543152

@@ -3345,7 +3343,6 @@ def _get_project(url, *_, **__):
33453343
pr_description_footer=DistgitAnnouncement.get_announcement(),
33463344
add_new_sources=True,
33473345
fast_forward_merge_branches=set(),
3348-
warn_about_koji_build_triggering_bug=False,
33493346
).and_return((pr, {})).once()
33503347
flexmock(PackitAPI).should_receive("clean")
33513348

tests/integration/test_release_event.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ def test_dist_git_push_release_handle(
233233
pr_description_footer=DistgitAnnouncement.get_announcement(),
234234
add_new_sources=True,
235235
fast_forward_merge_branches=set(),
236-
warn_about_koji_build_triggering_bug=False,
237236
).and_return((pr, {})).once()
238237
flexmock(PackitAPI).should_receive("clean")
239238

@@ -390,7 +389,6 @@ def test_dist_git_push_release_handle_fast_forward_branches(
390389
pr_description_footer=DistgitAnnouncement.get_announcement(),
391390
add_new_sources=True,
392391
fast_forward_merge_branches=set(),
393-
warn_about_koji_build_triggering_bug=False,
394392
).and_return((pr, {"rawhide": second_pr})).once()
395393
flexmock(PackitAPI).should_receive("clean")
396394

@@ -538,7 +536,6 @@ def test_dist_git_push_release_handle_multiple_branches(
538536
pr_description_footer=DistgitAnnouncement.get_announcement(),
539537
add_new_sources=True,
540538
fast_forward_merge_branches=set(),
541-
warn_about_koji_build_triggering_bug=False,
542539
).and_return((pr, {})).once()
543540

544541
flexmock(ProposeDownstreamJobHelper).should_receive(
@@ -694,7 +691,6 @@ def test_dist_git_push_release_handle_one_failed(
694691
pr_description_footer=DistgitAnnouncement.get_announcement(),
695692
add_new_sources=True,
696693
fast_forward_merge_branches=set(),
697-
warn_about_koji_build_triggering_bug=False,
698694
).and_return((pr, {})).once()
699695
flexmock(ProposeDownstreamJobHelper).should_receive(
700696
"report_status_for_branch",
@@ -718,7 +714,6 @@ def test_dist_git_push_release_handle_one_failed(
718714
pr_description_footer=DistgitAnnouncement.get_announcement(),
719715
add_new_sources=True,
720716
fast_forward_merge_branches=set(),
721-
warn_about_koji_build_triggering_bug=False,
722717
).and_raise(Exception, f"Failed {model.branch}").once()
723718
flexmock(ProposeDownstreamJobHelper).should_receive(
724719
"report_status_for_branch",
@@ -984,7 +979,6 @@ def test_retry_propose_downstream_task(
984979
pr_description_footer=DistgitAnnouncement.get_announcement(),
985980
add_new_sources=True,
986981
fast_forward_merge_branches=set(),
987-
warn_about_koji_build_triggering_bug=False,
988982
).and_raise(
989983
PackitDownloadFailedException,
990984
"Failed to download source from example.com",
@@ -1099,7 +1093,6 @@ def test_dont_retry_propose_downstream_task(
10991093
pr_description_footer=DistgitAnnouncement.get_announcement(),
11001094
add_new_sources=True,
11011095
fast_forward_merge_branches=set(),
1102-
warn_about_koji_build_triggering_bug=False,
11031096
).and_raise(
11041097
PackitDownloadFailedException,
11051098
"Failed to download source from example.com",

tests/unit/test_steve.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ def test_process_message(event, private, enabled_private_namespaces, success):
201201
pr_description_footer=DistgitAnnouncement.get_announcement(),
202202
add_new_sources=True,
203203
fast_forward_merge_branches=set(),
204-
warn_about_koji_build_triggering_bug=False,
205204
).and_return((pr, {})).times(1 if success else 0)
206205
flexmock(shutil).should_receive("rmtree").with_args("")
207206

0 commit comments

Comments
 (0)