Add rpmlint Fedora-CI runners by default (#2856)

Add rpmlint Fedora-CI runners by default

Follow-up to #2845. With this the parity with zuul should be all in place.

TODO:

 Write new tests or update the old ones to cover new functionality.



Merge after packit/tmt-plans#23

RELEASE NOTES BEGIN
Rpmlint are now run in Fedora-CI by default.
RELEASE NOTES END

Reviewed-by: gemini-code-assist[bot]
Reviewed-by: Laura Barcziová
Reviewed-by: Matej Focko

Author: softwarefactory-project-zuul[bot]

packit_service/worker/helpers/testing_farm.py

@@ -1475,6 +1475,22 @@ def _payload_rpminspect(self, distro: str, compose: str) -> dict:
         }
         return payload
 
+    @implements_fedora_ci_test("rpmlint")
+    def _payload_rpmlint(self, distro: str, compose: str) -> dict:
+        git_repo = "https://github.com/packit/tmt-plans.git"
+        git_ref = "main"
+        # rpmlint defines its own container in the tmt plan file,
+        # hence `compose=None`
+        payload = self._get_tf_base_payload(distro, None)
+        payload["test"] = {
+            "tmt": {
+                "url": git_repo,
+                "ref": git_ref,
+                "name": "/plans/rpmlint",
+            },
+        }
+        return payload
+
     @staticmethod
     def is_fmf_configured(project: GitProject, metadata: EventData) -> bool:
         try:

tests/integration/test_listen_to_fedmsg.py

@@ -2663,14 +2663,7 @@ def test_koji_build_end_downstream(
     }
 
     rpminspect_repo = "https://github.com/fedora-ci/rpminspect-pipeline.git"
-
-    payload_rpminspect = {
-        "test": {
-            "tmt": {
-                "url": rpminspect_repo,
-                "ref": "master",
-            },
-        },
+    common_payload_no_compose = {
         "environments": [
             {
                 "arch": "x86_64",
@@ -2701,6 +2694,29 @@ def test_koji_build_end_downstream(
         },
     }
 
+    payload_rpminspect = {
+        "test": {
+            "tmt": {
+                "url": rpminspect_repo,
+                "ref": "master",
+            },
+        },
+        **common_payload_no_compose,
+    }
+
+    rpmlint_repo = "https://github.com/packit/tmt-plans.git"
+
+    payload_rpmlint = {
+        "test": {
+            "tmt": {
+                "url": rpmlint_repo,
+                "ref": "main",
+                "name": "/plans/rpmlint",
+            },
+        },
+        **common_payload_no_compose,
+    }
+
     payload_custom = {
         "test": {
             "tmt": {
@@ -2772,6 +2788,16 @@ def test_koji_build_end_downstream(
             json={"id": pipeline_id},
         ),
     ).once()
+    flexmock(TestingFarmClient).should_receive(
+        "send_testing_farm_request",
+    ).with_args(endpoint="requests", method="POST", data=payload_rpmlint).and_return(
+        RequestResponse(
+            status_code=200,
+            ok=True,
+            content=json.dumps({"id": pipeline_id}).encode(),
+            json={"id": pipeline_id},
+        ),
+    ).once()
     flexmock(TestingFarmClient).should_receive(
         "send_testing_farm_request",
     ).with_args(endpoint="requests", method="POST", data=payload_custom).and_return(
@@ -2822,11 +2848,25 @@ def test_koji_build_end_downstream(
         .once()
         .mock()
     )
+    tft_test_run_model_rpmlint = (
+        flexmock(
+            id=8,
+            koji_builds=[koji_build_pr_downstream],
+            status=TestingFarmResult.new,
+            target="fedora-rawhide",
+            data={"fedora_ci_test": "rpmlint"},
+        )
+        .should_receive("set_pipeline_id")
+        .with_args(pipeline_id)
+        .once()
+        .mock()
+    )
     group = flexmock(
         grouped_targets=[
             tft_test_run_model_installability,
             tft_test_run_model_custom,
             tft_test_run_model_rpminspect,
+            tft_test_run_model_rpmlint,
         ]
     )
     flexmock(TFTTestRunGroupModel).should_receive("create").with_args(
@@ -2872,6 +2912,19 @@ def test_koji_build_end_downstream(
             "fedora_ci_test": "rpminspect",
         },
     ).and_return(tft_test_run_model_rpminspect).once()
+    flexmock(TFTTestRunTargetModel).should_receive("create").with_args(
+        pipeline_id=None,
+        identifier=None,
+        status=TestingFarmResult.new,
+        target="fedora-rawhide",
+        web_url=None,
+        test_run_group=group,
+        koji_build_targets=[koji_build_pr_downstream],
+        data={
+            "base_project_url": "https://src.fedoraproject.org/rpms/packit",
+            "fedora_ci_test": "rpmlint",
+        },
+    ).and_return(tft_test_run_model_rpmlint).once()
 
     # check if packit-service set correct PR statuses
     flexmock(StatusReporter).should_receive("set_status").with_args(
@@ -2923,6 +2976,20 @@ def test_koji_build_end_downstream(
         check_name="Packit - rpminspect test(s)",
         target_branch="rawhide",
     ).once()
+    flexmock(StatusReporter).should_receive("set_status").with_args(
+        state=BaseCommitStatus.running,
+        description="Submitting the tests ...",
+        url="",
+        check_name="Packit - rpmlint test(s)",
+        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 test(s)",
+        target_branch="rawhide",
+    ).once()
 
     urls.DASHBOARD_URL = "https://dashboard.localhost"
 

tests/integration/test_pr_comment.py

@@ -3446,6 +3446,7 @@ def _test_downstream_tf_retrigger_common(
             [
                 ("380723461ab74e1cde4eb89b711c8f1d", "Packit - installability test(s) - rawhide"),
                 ("27516f942959e4114b2856f76852577a", "Packit - rpminspect test(s) - rawhide"),
+                ("e02f17936a385a5031056e304b9c5de6", "Packit - rpmlint test(s) - rawhide"),
             ],
             id="rawhide target branch",
         ),
@@ -3454,6 +3455,7 @@ def _test_downstream_tf_retrigger_common(
             [
                 ("a478035df5f8599527e3e37bfc2ca25f", "Packit - installability test(s) - f42"),
                 ("e9d900e81542cc243d51d9058f1845d3", "Packit - rpminspect test(s) - f42"),
+                ("a4de9ef7a17005c5404c54acab49d599", "Packit - rpmlint test(s) - f42"),
             ],
             id="f42 target branch",
         ),
@@ -3469,7 +3471,7 @@ def test_downstream_testing_farm_retrigger_via_dist_git_pr_comment(
         target_branch,
         flags,
         "/packit-ci test",
-        tests=2,
+        tests=3,
     )