Make Fedora CI check names deployment-aware (#3016)

Make Fedora CI check names deployment-aware

Add "stg" prefix to check names for staging environment

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

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

packit_service/worker/handlers/abstract.py

@@ -597,10 +597,27 @@ def __init__(
 
 
 class FedoraCIJobHandler(JobHandler):
-    check_name: str = ""
+    _check_name: str = ""
+
+    @staticmethod
+    def get_check_name_prefix(service_config: ServiceConfig) -> str:
+        """Return the prefix for check names based on deployment environment."""
+        return "Packit-stg" if service_config.deployment == Deployment.stg else "Packit"
+
+    @classmethod
+    def get_check_name(cls, service_config: ServiceConfig) -> str:
+        """Return check name based on deployment environment."""
+        prefix = cls.get_check_name_prefix(service_config)
+        return f"{prefix} - {cls._check_name}" if cls._check_name else ""
+
+    @property
+    def check_name(self) -> str:
+        """Return the check name."""
+        return self.get_check_name(self.service_config)
 
     @classmethod
-    def get_check_names(
+    def get_all_check_names(
         cls, service_config: ServiceConfig, project: GitProject, metadata: EventData
     ) -> list[str]:
-        return [cls.check_name] if cls.check_name else []
+        """Return check names."""
+        return [cls.get_check_name(service_config)] if cls.get_check_name(service_config) else []

packit_service/worker/handlers/distgit.py

@@ -790,7 +790,7 @@ class DownstreamKojiScratchBuildHandler(
     """
 
     task_name = TaskName.downstream_koji_scratch_build
-    check_name = "Packit - scratch build"
+    _check_name = "scratch build"
 
     def __init__(
         self,

packit_service/worker/handlers/koji.py

@@ -344,7 +344,7 @@ def push_metrics(self) -> None:
 @reacts_to_as_fedora_ci(event=koji.result.Task)
 class KojiTaskReportDownstreamHandler(AbstractKojiTaskReportHandler, FedoraCIJobHandler):
     task_name = TaskName.downstream_koji_scratch_build_report
-    check_name = "Packit - scratch build"
+    _check_name = "scratch build"
     _helper: Optional[FedoraCIHelper] = None
 
     @property

packit_service/worker/handlers/testing_farm.py

@@ -400,11 +400,11 @@ def filter_ci_tests(cls, tests: list[str]) -> list[str]:
         return tests
 
     @classmethod
-    def get_check_names(
+    def get_all_check_names(
         cls, service_config: ServiceConfig, project: GitProject, metadata: EventData
     ) -> list[str]:
         return [
-            DownstreamTestingFarmJobHelper.get_check_name(t)
+            DownstreamTestingFarmJobHelper.get_check_name_from_config(t, service_config)
             for t in cls.filter_ci_tests(
                 DownstreamTestingFarmJobHelper.get_fedora_ci_tests(
                     service_config, project, metadata

packit_service/worker/helpers/testing_farm.py

@@ -41,6 +41,7 @@
 from packit_service.service.urls import get_testing_farm_info_url
 from packit_service.utils import get_package_nvrs, get_packit_commands_from_comment
 from packit_service.worker.celery_task import CeleryTask
+from packit_service.worker.handlers.abstract import FedoraCIJobHandler
 from packit_service.worker.helpers.build import CoprBuildJobHelper
 from packit_service.worker.helpers.fedora_ci import FedoraCIHelper
 from packit_service.worker.helpers.testing_farm_client import TestingFarmClient
@@ -1363,9 +1364,15 @@ def pr(self) -> PullRequest:
             self._pr = self.project.get_pr(self.metadata.pr_id)
         return self._pr
 
+    def get_check_name(self, test_name: str) -> str:
+        """Return check name based on deployment environment."""
+        return self.get_check_name_from_config(test_name, self.service_config)
+
     @staticmethod
-    def get_check_name(test_name: str) -> str:
-        return f"Packit - {test_name}"
+    def get_check_name_from_config(test_name: str, service_config: ServiceConfig) -> str:
+        """Static version for use in class methods."""
+        prefix = FedoraCIJobHandler.get_check_name_prefix(service_config)
+        return f"{prefix} - {test_name}"
 
     def report(
         self,

packit_service/worker/jobs.py

@@ -560,7 +560,7 @@ def report_task_accepted_for_fedora_ci(self, handler_kls: type[FedoraCIJobHandle
         )
 
         first_status_reported = False
-        for check_name in handler_kls.get_check_names(
+        for check_name in handler_kls.get_all_check_names(
             self.service_config, self.event.project, metadata
         ):
             helper.report(

tests/integration/test_dg_pr.py

@@ -45,22 +45,22 @@ def distgit_pr_event():
     [
         pytest.param(
             "rawhide",
-            "da02b4ee9881488e777cd22bbb13987f",
-            "Packit - scratch build - rawhide [889f07a]",
+            "e7593c9ba1d17d1a4f366b6aa7f53e84",
+            "Packit-stg - scratch build - rawhide [889f07a]",
             False,
             id="rawhide target branch",
         ),
         pytest.param(
             "rawhide",
-            "f4a160072a397b8fca2304d80f36fc76",
-            "Packit - scratch build - eln [889f07a]",
+            "07209e112c3135ab74e0da0bd0e321ca",
+            "Packit-stg - scratch build - eln [889f07a]",
             True,
             id="rawhide branch, rawhide + eln target",
         ),
         pytest.param(
             "f42",
-            "44e52710e6df077ddc07e16df1cbf6b7",
-            "Packit - scratch build - f42 [889f07a]",
+            "4196b23fba5a53425b6f15a11fd2ef15",
+            "Packit-stg - scratch build - f42 [889f07a]",
             False,
             id="f42 target branch",
         ),
@@ -84,8 +84,8 @@ def test_downstream_koji_scratch_build(distgit_pr_event, target_branch, uid, che
         .mock()
     )
     if eln:
-        check_name = "Packit - scratch build - rawhide [889f07a]"
-        uid = "da02b4ee9881488e777cd22bbb13987f"
+        check_name = "Packit-stg - scratch build - rawhide [889f07a]"
+        uid = "e7593c9ba1d17d1a4f366b6aa7f53e84"
         (
             pr_object.should_receive("set_flag")
             .with_args(username=check_name, comment=str, url=str, status=CommitStatus, uid=uid)

tests/integration/test_listen_to_fedmsg.py

@@ -2957,63 +2957,63 @@ def test_koji_build_end_downstream(
         state=BaseCommitStatus.success,
         description="RPM build succeeded.",
         url=url,
-        check_name="Packit - scratch build",
+        check_name="Packit-stg - scratch build",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Submitting the tests ...",
         url="https://dashboard.localhost/jobs/testing-farm/5",
-        check_name="Packit - installability",
+        check_name="Packit-stg - installability",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Tests have been submitted ...",
         url="https://dashboard.localhost/jobs/testing-farm/5",
-        check_name="Packit - installability",
+        check_name="Packit-stg - installability",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Submitting the tests ...",
         url="https://dashboard.localhost/jobs/testing-farm/6",
-        check_name="Packit - custom",
+        check_name="Packit-stg - custom",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Tests have been submitted ...",
         url="https://dashboard.localhost/jobs/testing-farm/6",
-        check_name="Packit - custom",
+        check_name="Packit-stg - custom",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Submitting the tests ...",
         url="https://dashboard.localhost/jobs/testing-farm/7",
-        check_name="Packit - rpminspect",
+        check_name="Packit-stg - rpminspect",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Tests have been submitted ...",
         url="https://dashboard.localhost/jobs/testing-farm/7",
-        check_name="Packit - rpminspect",
+        check_name="Packit-stg - rpminspect",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Submitting the tests ...",
         url="https://dashboard.localhost/jobs/testing-farm/8",
-        check_name="Packit - rpmlint",
+        check_name="Packit-stg - rpmlint",
         target_branch="rawhide",
     ).once()
     flexmock(StatusReporter).should_receive("set_status").with_args(
         state=BaseCommitStatus.running,
         description="Tests have been submitted ...",
         url="https://dashboard.localhost/jobs/testing-farm/8",
-        check_name="Packit - rpmlint",
+        check_name="Packit-stg - rpmlint",
         target_branch="rawhide",
     ).once()
 
@@ -3430,7 +3430,7 @@ def test_pagure_pr_updated(pagure_pr_updated, project_namespace, project_repo):
             state=BaseCommitStatus.running,
             description="RPM build was submitted ...",
             url="https://dashboard.localhost/jobs/koji/123",
-            check_name="Packit - scratch build",
+            check_name="Packit-stg - scratch build",
             target_branch="rawhide",
         ).once()
     else:
@@ -3518,14 +3518,14 @@ def test_pagure_pr_updated(pagure_pr_updated, project_namespace, project_repo):
             state=BaseCommitStatus.running,
             description="Submitting the tests ...",
             url="https://dashboard.localhost/jobs/testing-farm/6",
-            check_name="Packit - custom",
+            check_name="Packit-stg - custom",
             target_branch="rawhide",
         ).once()
         flexmock(StatusReporter).should_receive("set_status").with_args(
             state=BaseCommitStatus.running,
             description="Tests have been submitted ...",
             url="https://dashboard.localhost/jobs/testing-farm/6",
-            check_name="Packit - custom",
+            check_name="Packit-stg - custom",
             target_branch="rawhide",
         ).once()
 

tests/integration/test_pr_comment.py

@@ -2461,14 +2461,14 @@ def test_koji_build_retrigger_via_dist_git_pr_comment(pagure_pr_comment_added):
     [
         pytest.param(
             "rawhide",
-            "45f8d1e6ef3ca9f57d9ed4dc82919216",
-            "Packit - scratch build - rawhide [beaf90b]",
+            "7f6d17aef35c10b4429b018288140d2e",
+            "Packit-stg - scratch build - rawhide [beaf90b]",
             id="rawhide target branch",
         ),
         pytest.param(
             "f42",
-            "436202b02405a83e4f8cf57ed908c0cc",
-            "Packit - scratch build - f42 [beaf90b]",
+            "71105829c34639d62676a5e5b5cf2a61",
+            "Packit-stg - scratch build - f42 [beaf90b]",
             id="f42 target branch",
         ),
     ],
@@ -3471,16 +3471,16 @@ def _test_downstream_tf_retrigger_common(
             "rawhide",
             [
                 (
-                    "d6180f0168d35be241dd9502ccebf427",
-                    "Packit - installability - rawhide [beaf90b]",
+                    "be4571bd828a699b35ed3102fc7e88f5",
+                    "Packit-stg - installability - rawhide [beaf90b]",
                 ),
                 (
-                    "2c980bef6257ac6f3e40d09151218997",
-                    "Packit - rpminspect - rawhide [beaf90b]",
+                    "9b6239fe5ed9fd065540810c5591f352",
+                    "Packit-stg - rpminspect - rawhide [beaf90b]",
                 ),
                 (
-                    "251118c3a3695047d34973df58f099f1",
-                    "Packit - rpmlint - rawhide [beaf90b]",
+                    "cafe8a3fb7c24f7534a6157514dda0f3",
+                    "Packit-stg - rpmlint - rawhide [beaf90b]",
                 ),
             ],
             id="rawhide target branch",
@@ -3489,11 +3489,11 @@ def _test_downstream_tf_retrigger_common(
             "f42",
             [
                 (
-                    "7d0be14827d57f19280b3e08ef7a0aca",
-                    "Packit - installability - f42 [beaf90b]",
+                    "c39c286752c4b7987058134bc3b16683",
+                    "Packit-stg - installability - f42 [beaf90b]",
                 ),
-                ("ef105a8a3c47785c5827647dcfd6ce31", "Packit - rpminspect - f42 [beaf90b]"),
-                ("2f36dd43d50caa95f0e40c7365f9e4d2", "Packit - rpmlint - f42 [beaf90b]"),
+                ("d6df09a49152552c196c4d06f286abef", "Packit-stg - rpminspect - f42 [beaf90b]"),
+                ("6901e099dadbb89822e6a64c411ceb8c", "Packit-stg - rpmlint - f42 [beaf90b]"),
             ],
             id="f42 target branch",
         ),
@@ -3519,22 +3519,22 @@ def test_downstream_testing_farm_retrigger_via_dist_git_pr_comment(
         pytest.param(
             "/packit-ci test installability",
             "rawhide",
-            "d6180f0168d35be241dd9502ccebf427",
-            "Packit - installability - rawhide [beaf90b]",
+            "be4571bd828a699b35ed3102fc7e88f5",
+            "Packit-stg - installability - rawhide [beaf90b]",
             id="installability - rawhide target branch",
         ),
         pytest.param(
             "/packit-ci test installability",
             "f42",
-            "7d0be14827d57f19280b3e08ef7a0aca",
-            "Packit - installability - f42 [beaf90b]",
+            "c39c286752c4b7987058134bc3b16683",
+            "Packit-stg - installability - f42 [beaf90b]",
             id="installability - f42 target branch",
         ),
         pytest.param(
             "/packit-ci test rpminspect",
             "rawhide",
-            "2c980bef6257ac6f3e40d09151218997",
-            "Packit - rpminspect - rawhide [beaf90b]",
+            "9b6239fe5ed9fd065540810c5591f352",
+            "Packit-stg - rpminspect - rawhide [beaf90b]",
             id="rpminspect - rawhide target branch",
         ),
     ],

tests/unit/test_testing_farm.py

@@ -12,6 +12,7 @@
     JobType,
     PackageConfig,
 )
+from packit.config.common_package_config import Deployment
 from packit.copr_helper import CoprHelper
 from packit.local_project import LocalProject
 
@@ -265,6 +266,7 @@ def test_downstream_testing_farm_response(
     config = flexmock(
         command_handler_work_dir=flexmock(),
         comment_command_prefix="/packit",
+        deployment=Deployment.stg,
     )
     flexmock(DownstreamTFResultsHandler).should_receive("service_config").and_return(config)
     flexmock(TFResultsEvent).should_receive("db_project_object").and_return(None)
@@ -301,7 +303,7 @@ def test_downstream_testing_farm_response(
         state=status_status,
         description=status_message,
         url="some url",
-        check_name="Packit - installability",
+        check_name="Packit-stg - installability",
         target_branch="rawhide",
     ).once()