Several fixes for ELN tests on rawhide dist-git PRs (#2950)

Several fixes for ELN tests on rawhide dist-git PRs

Matching Koji scratch builds are now identified by TF pipeline ID rather than PR target branch and there is a new handler for /packit-ci test that retriggers ELN tests.
Related to #2920.

Reviewed-by: gemini-code-assist[bot]
Reviewed-by: Nikola Forró
Reviewed-by: Maja Massarini
Reviewed-by: Laura Barcziová

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

packit_service/worker/checker/testing_farm.py

@@ -69,6 +69,10 @@ def pre_check(self) -> bool:
         return bool(self.koji_task_event and self.koji_task_event.state == KojiTaskState.closed)
 
 
+class IsEventOkForFedoraCIAsRawhideELN(IsEventOkForFedoraCI):
+    _rawhide_eln_build = True
+
+
 class IsEventForJob(Checker):
     def pre_check(self) -> bool:
         if self.data.identifier != self.job_config.identifier:

packit_service/worker/handlers/__init__.py

@@ -36,6 +36,7 @@
     CoprOpenScanHubTaskStartedHandler,
 )
 from packit_service.worker.handlers.testing_farm import (
+    DownstreamTestingFarmELNHandler,
     DownstreamTestingFarmHandler,
     DownstreamTestingFarmResultsHandler,
     TestingFarmHandler,
@@ -58,6 +59,7 @@
     KojiBuildHandler.__name__,
     KojiTaskReportHandler.__name__,
     DownstreamTestingFarmHandler.__name__,
+    DownstreamTestingFarmELNHandler.__name__,
     DownstreamTestingFarmResultsHandler.__name__,
     TestingFarmHandler.__name__,
     TestingFarmResultsHandler.__name__,

packit_service/worker/handlers/abstract.py

@@ -225,6 +225,7 @@ class TaskName(str, enum.Enum):
     testing_farm = "task.run_testing_farm_handler"
     testing_farm_results = "task.run_testing_farm_results_handler"
     downstream_testing_farm = "task.run_downstream_testing_farm_handler"
+    downstream_testing_farm_eln = "task.run_downstream_testing_farm_eln_handler"
     downstream_testing_farm_results = "task.run_downstream_testing_farm_results_handler"
     propose_downstream = "task.run_propose_downstream_handler"
     upstream_koji_build = "task.run_koji_build_handler"

packit_service/worker/handlers/mixin.py

@@ -28,6 +28,7 @@
     KojiBuildTargetModel,
     ProjectEventModel,
     SRPMBuildModel,
+    TFTTestRunTargetModel,
 )
 from packit_service.utils import get_packit_commands_from_comment
 from packit_service.worker.handlers.abstract import CeleryTask
@@ -97,6 +98,8 @@ def db_project_event(self) -> Optional[ProjectEventModel]: ...
 class GetKojiBuildFromTaskOrPullRequestMixin(GetKojiBuild, GetKojiTaskEventMixin):
     _koji_build: Optional[KojiBuildTargetModel] = None
     _db_project_event: Optional[ProjectEventModel] = None
+    _rawhide_eln_build: bool = False
+    pipeline_id: Optional[str] = None
 
     @property
     def koji_build(self) -> Optional[KojiBuildTargetModel]:
@@ -105,11 +108,26 @@ def koji_build(self) -> Optional[KojiBuildTargetModel]:
                 self._koji_build = KojiBuildTargetModel.get_by_task_id(
                     str(self.koji_task_event.task_id)
                 )
+            elif self.pipeline_id:
+                run_model = TFTTestRunTargetModel.get_by_pipeline_id(
+                    pipeline_id=self.pipeline_id,
+                )
+                if not run_model:
+                    logger.error(f"No test run found for TF pipeline {self.pipeline_id}")
+                    return None
+                if (build_count := len(run_model.koji_builds)) != 1:
+                    logger.error(
+                        f"Expected a single Koji build matching TF pipeline {self.pipeline_id}, "
+                        f"found {build_count} builds"
+                    )
+                    return None
+                self._koji_build = run_model.koji_builds[0]
             else:
                 pull_request = self.project.get_pr(self.data.pr_id)
                 self._koji_build = (
                     KojiBuildTargetModel.get_last_successful_scratch_by_commit_target(
-                        pull_request.head_commit, pull_request.target_branch
+                        pull_request.head_commit,
+                        pull_request.target_branch if not self._rawhide_eln_build else "eln",
                     )
                 )
         return self._koji_build

packit_service/worker/handlers/testing_farm.py

@@ -41,13 +41,17 @@
 )
 from packit_service.utils import elapsed_seconds
 from packit_service.worker.checker.abstract import Checker
-from packit_service.worker.checker.distgit import PermissionOnDistgitForFedoraCI
+from packit_service.worker.checker.distgit import (
+    PackageNeedsELNBuildFromRawhide,
+    PermissionOnDistgitForFedoraCI,
+)
 from packit_service.worker.checker.testing_farm import (
     CanActorRunJob,
     IsCoprBuildDefined,
     IsEventForJob,
     IsEventOk,
     IsEventOkForFedoraCI,
+    IsEventOkForFedoraCIAsRawhideELN,
     IsIdentifierFromCommentMatching,
     IsJobConfigTriggerMatching,
     IsLabelFromCommentMatching,
@@ -484,6 +488,22 @@ def run(self) -> TaskResults:
         return TaskResults(success=False, details=result_details)
 
 
+@run_for_comment_as_fedora_ci(command="test")
+@reacts_to_as_fedora_ci(event=pagure.pr.Comment)
+class DownstreamTestingFarmELNHandler(DownstreamTestingFarmHandler):
+    __test__ = False
+    _rawhide_eln_build = True
+    task_name = TaskName.downstream_testing_farm_eln
+
+    @staticmethod
+    def get_checkers() -> tuple[type[Checker], ...]:
+        return (
+            PackageNeedsELNBuildFromRawhide,
+            IsEventOkForFedoraCIAsRawhideELN,
+            PermissionOnDistgitForFedoraCI,
+        )
+
+
 @configured_as(job_type=JobType.tests)
 @reacts_to(event=testing_farm.Result)
 class TestingFarmResultsHandler(

packit_service/worker/tasks.py

@@ -53,6 +53,7 @@
     CoprOpenScanHubTaskFinishedHandler,
     CoprOpenScanHubTaskStartedHandler,
     DownstreamLogDetectiveResultsHandler,
+    DownstreamTestingFarmELNHandler,
     DownstreamTestingFarmHandler,
     DownstreamTestingFarmResultsHandler,
     GithubAppInstallationHandler,
@@ -350,6 +351,24 @@ def run_downstream_testing_farm_handler(
     return get_handlers_task_results(handler.run_job(), event)
 
 
+@celery_app.task(bind=True, name=TaskName.downstream_testing_farm_eln, base=TaskWithRetry)
+def run_downstream_testing_farm_eln_handler(
+    self,
+    event: dict,
+    package_config: dict,
+    job_config: dict,
+    testing_farm_target_id: Optional[int] = None,
+):
+    handler = DownstreamTestingFarmELNHandler(
+        package_config=load_package_config(package_config),
+        job_config=load_job_config(job_config),
+        event=event,
+        celery_task=self,
+        testing_farm_target_id=testing_farm_target_id,
+    )
+    return get_handlers_task_results(handler.run_job(), event)
+
+
 @celery_app.task(name=TaskName.downstream_testing_farm_results, base=TaskWithRetry)
 def run_downstream_testing_farm_results_handler(
     event: dict,

tests/integration/test_pr_comment.py

@@ -29,6 +29,7 @@
 
 import packit_service.models
 import packit_service.service.urls as urls
+from packit_service import utils
 from packit_service.config import ServiceConfig
 from packit_service.constants import (
     COMMENT_REACTION,
@@ -2577,6 +2578,8 @@ def test_downstream_koji_scratch_build_retrigger_via_dist_git_pr_comment(
         flexmock(grouped_targets=[koji_build]),
     )
 
+    flexmock(utils).should_receive("get_eln_packages").and_return([])
+
     flexmock(LocalProjectBuilder, _refresh_the_state=lambda *args: None)
     flexmock(Signature).should_receive("apply_async").once()
     flexmock(Pushgateway).should_receive("push").times(2).and_return()
@@ -3422,6 +3425,8 @@ def _test_downstream_tf_retrigger_common(
         TaskResults(success=True, details={}),
     )
 
+    flexmock(utils).should_receive("get_eln_packages").and_return([])
+
     flexmock(Signature).should_receive("apply_async").once()
     flexmock(Pushgateway).should_receive("push").times(2).and_return()
 

tests/unit/test_testing_farm.py

@@ -31,7 +31,6 @@
 from packit_service.models import (
     BuildStatus,
     CoprBuildTargetModel,
-    KojiBuildTargetModel,
     PipelineModel,
     ProjectEventModel,
     ProjectEventModelType,
@@ -314,6 +313,7 @@ def test_downstream_testing_farm_response(
             target="fedora-rawhide",
             status=None,
             data={"fedora_ci_test": "installability"},
+            koji_builds=[flexmock(target="rawhide")],
         )
         .should_receive("get_project_event_model")
         .and_return(
@@ -348,10 +348,6 @@ def test_downstream_testing_farm_response(
 
     flexmock(LocalProject).should_receive("refresh_the_arguments").and_return(None)
 
-    flexmock(KojiBuildTargetModel).should_receive(
-        "get_last_successful_scratch_by_commit_target"
-    ).with_args("0000000000", "rawhide").and_return(flexmock(target="rawhide"))
-
     test_farm_handler.run()