Skip to content

Commit 99e544d

Browse files
Pass target repo URL according to use_target_repo_for_fmf_url (#2752)
Pass target repo URL according to use_target_repo_for_fmf_url Fixes #2748 Requires packit/packit#2552 TODO: tests RELEASE NOTES BEGIN It is now possible to set use_target_repo_for_fmf_url configuration flag to bypass the default passing of fork URLs for test requests. RELEASE NOTES END Reviewed-by: Matej Focko Reviewed-by: Nikola Forró
2 parents 7a71286 + 073e4a0 commit 99e544d

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

packit_service/worker/helpers/testing_farm.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,11 @@ def custom_fmf(self) -> bool:
215215
def fmf_url(self) -> str:
216216
return (
217217
self.job_config.fmf_url
218-
or (self.pull_request_object and self.pull_request_object.source_project.get_web_url())
218+
or (
219+
self.pull_request_object
220+
and not self.job_config.use_target_repo_for_fmf_url
221+
and self.pull_request_object.source_project.get_web_url()
222+
)
219223
or self.project.get_web_url()
220224
)
221225

tests/unit/test_testing_farm.py

+15-7
Original file line numberDiff line numberDiff line change
@@ -1490,23 +1490,24 @@ def test_trigger_build_manual_tests_dont_report():
14901490

14911491

14921492
@pytest.mark.parametrize(
1493-
("job_fmf_url", "pr_id", "fmf_url"),
1493+
("job_fmf_url", "job_use_target_repo_for_fmf_url", "pr_id", "fmf_url"),
14941494
[
14951495
# custom set URL
1496-
("https://custom.xyz/mf/fmf/", None, "https://custom.xyz/mf/fmf/"),
1496+
("https://custom.xyz/mf/fmf/", False, None, "https://custom.xyz/mf/fmf/"),
14971497
# PR, from fork
1498-
(None, 42, "https://github.com/mf/packit"),
1498+
(None, False, 42, "https://github.com/mf/packit"),
14991499
# if from branch
1500-
(None, None, "https://github.com/packit/packit"),
1500+
(None, False, None, "https://github.com/packit/packit"),
1501+
(None, True, 42, "https://github.com/packit/packit"),
15011502
],
15021503
)
1503-
def test_fmf_url(job_fmf_url, pr_id, fmf_url):
1504+
def test_fmf_url(job_fmf_url, job_use_target_repo_for_fmf_url, pr_id, fmf_url):
15041505
job_config = JobConfig(
15051506
trigger=JobConfigTriggerType.pull_request,
15061507
type=JobType.tests,
15071508
packages={
15081509
"package": CommonPackageConfig(
1509-
fmf_url=job_fmf_url,
1510+
fmf_url=job_fmf_url, use_target_repo_for_fmf_url=job_use_target_repo_for_fmf_url
15101511
),
15111512
},
15121513
)
@@ -1518,9 +1519,16 @@ def test_fmf_url(job_fmf_url, pr_id, fmf_url):
15181519
elif pr_id is not None:
15191520
git_project.should_receive("get_pr").with_args(pr_id).and_return(
15201521
flexmock(
1521-
source_project=flexmock().should_receive("get_web_url").and_return(fmf_url).mock(),
1522+
source_project=flexmock()
1523+
.should_receive("get_web_url")
1524+
.and_return("https://github.com/mf/packit")
1525+
.mock(),
15221526
),
15231527
)
1528+
if job_use_target_repo_for_fmf_url:
1529+
git_project.should_receive("get_web_url").and_return(
1530+
"https://github.com/packit/packit",
1531+
).once()
15241532
else:
15251533
git_project.should_receive("get_web_url").and_return(
15261534
"https://github.com/packit/packit",

0 commit comments

Comments
 (0)