Support submitting Copr builds from dist-git repos (#3208)

Support submitting Copr builds from dist-git repos

RELEASE NOTES BEGIN
Packit now supports submitting Copr builds from dist-git repositories.
RELEASE NOTES END

Reviewed-by: Matej Focko

Author: centosinfra-prod-github-app[bot]

packit_service/worker/handlers/copr.py

@@ -124,7 +124,7 @@ def _run(self) -> TaskResults:
         if os.getenv("CANCEL_RUNNING_JOBS"):
             self.copr_build_helper.cancel_running_builds()
 
-        return self.copr_build_helper.run_copr_build_from_source_script()
+        return self.copr_build_helper.run_copr_build()
 
 
 class AbstractCoprBuildReportHandler(

packit_service/worker/helpers/build/copr_build.py

@@ -521,45 +521,21 @@ def report_running_build_and_test_on_build_submission(self, web_url: str):
             url=url_for_tests,
         )
 
-    def run_copr_build_from_source_script(self) -> TaskResults:
+    def run_copr_build(self) -> TaskResults:
         """
-        Run copr build using custom source method.
+        Run copr build using either the custom source method (default)
+        or the dist-git method if configured.
         """
         self._srpm_model, self.run_model = SRPMBuildModel.create_with_new_run(
             project_event_model=self.db_project_event,
             package_name=self.get_package_name(),
         )
         group = self._get_or_create_build_group()
+        script = None
         try:
-            pr_id = self.metadata.pr_id
-
-            # use correct git ref to identify most recent tag
-            if self.job_config.trigger == JobConfigTriggerType.pull_request:
-                merged_ref = self.pull_request_object.target_branch
-            elif self.job_config.trigger == JobConfigTriggerType.commit:
-                merged_ref = self.metadata.commit_sha
-            elif self.job_config.trigger == JobConfigTriggerType.release:
-                merged_ref = self.metadata.tag_name
-            else:
-                logger.warning(
-                    f"Unable to determine merged ref for {self.job_config.trigger}",
-                )
-                merged_ref = None
-
-            script = create_source_script(
-                url=self.metadata.project_url,
-                ref=self.metadata.git_ref,
-                pr_id=str(pr_id) if pr_id else None,
-                merge_pr=self.package_config.merge_pr_in_ci,
-                target_branch=(
-                    self.pull_request_object.target_branch if self.pull_request_object else None
-                ),
-                job_config_index=self.get_job_config_index(),
-                update_release=self.job_config.trigger != JobConfigTriggerType.release,
-                release_suffix=self.job_config.release_suffix,
-                package=self.job_config.package,
-                merged_ref=merged_ref,
-            )
+            if not self.job_config.use_copr_dist_git_build:
+                script = self._prepare_source_script()
+
             build_id, web_url = self.submit_copr_build(script=script)
         except Exception as ex:
             return self.handle_build_submit_error(group, ex)
@@ -572,6 +548,37 @@ def run_copr_build_from_source_script(self) -> TaskResults:
 
         return TaskResults(success=True, details={})
 
+    def _prepare_source_script(self) -> str:
+        pr_id = self.metadata.pr_id
+
+        # use correct git ref to identify most recent tag
+        if self.job_config.trigger == JobConfigTriggerType.pull_request:
+            merged_ref = self.pull_request_object.target_branch
+        elif self.job_config.trigger == JobConfigTriggerType.commit:
+            merged_ref = self.metadata.commit_sha
+        elif self.job_config.trigger == JobConfigTriggerType.release:
+            merged_ref = self.metadata.tag_name
+        else:
+            logger.warning(
+                f"Unable to determine merged ref for {self.job_config.trigger}",
+            )
+            merged_ref = None
+
+        return create_source_script(
+            url=self.metadata.project_url,
+            ref=self.metadata.git_ref,
+            pr_id=str(pr_id) if pr_id else None,
+            merge_pr=self.package_config.merge_pr_in_ci,
+            target_branch=(
+                self.pull_request_object.target_branch if self.pull_request_object else None
+            ),
+            job_config_index=self.get_job_config_index(),
+            update_release=self.job_config.trigger != JobConfigTriggerType.release,
+            release_suffix=self.job_config.release_suffix,
+            package=self.job_config.package,
+            merged_ref=merged_ref,
+        )
+
     def _get_or_create_build_group(self) -> CoprBuildGroupModel:
         if self._copr_build_group_id is not None:
             group = CoprBuildGroupModel.get_by_id(self._copr_build_group_id)
@@ -638,7 +645,7 @@ def get_latest_fedora_stable_chroot(self) -> str:
     def submit_copr_build(self, script: Optional[str] = None) -> tuple[int, str]:
         """
         Create the project in Copr if not exists and submit a new build using
-        source script method
+        either the custom source method (default) or the dist-git method if configured.
         Return:
             tuple of build ID and web url
         """
@@ -658,7 +665,18 @@ def submit_copr_build(self, script: Optional[str] = None) -> tuple[int, str]:
                 },
             )
 
-            if script:
+            if self.job_config.use_copr_dist_git_build:
+                build = self.api.copr_helper.copr_client.build_proxy.create_from_distgit(
+                    ownername=owner,
+                    projectname=self.job_project,
+                    packagename=self.job_config.package,
+                    committish=self.metadata.git_ref,
+                    # TODO: parametrize this hardcoded value
+                    distgit="rhai",
+                    buildopts=buildopts,
+                )
+
+            elif script:
                 build = self.api.copr_helper.copr_client.build_proxy.create_from_custom(
                     ownername=owner,
                     projectname=self.job_project,

tests/unit/test_copr_build.py

@@ -309,7 +309,7 @@ def test_run_copr_build_from_source_script(github_pr_event, srpm_build_deps):
         "fedora-35-x86_64",
     )
 
-    flexmock(helper).should_call("run_copr_build_from_source_script").once()
+    flexmock(helper).should_call("run_copr_build").once()
 
     flexmock(Client).should_receive("create_from_config_file").and_return(
         flexmock(
@@ -477,7 +477,7 @@ def test_run_copr_build_from_source_script_github_outage_retry(
         flexmock(build).should_receive("set_status").with_args(BuildStatus.error)
         srpm_model.should_receive("set_status").with_args(BuildStatus.error)
 
-    assert helper.run_copr_build_from_source_script()["success"] is retry
+    assert helper.run_copr_build()["success"] is retry
 
 
 @pytest.mark.parametrize(