Drop inclusion of koji artifact for now

Eventually the tests should use the repo created by the artifacts and multihost pipeline, but these are not ready to do so yet

Signed-off-by: Cristian Le <git@lecris.dev>

Author: LecrisUT

packit_service/worker/helpers/testing_farm.py

@@ -1526,7 +1526,7 @@ def prepare_and_send_tf_request(
     def _payload_installability(self, distro: str, compose: str) -> dict:
         git_repo = "https://github.com/fedora-ci/installability-pipeline.git"
         git_ref = "master"
-        payload = self._get_tf_base_payload(distro, compose)
+        payload = self._get_tf_base_payload(distro, compose, with_artifacts=False)
         payload["test"] = {
             "tmt": {
                 "url": git_repo,
@@ -1544,7 +1544,7 @@ def _payload_rpminspect(self, distro: str, compose: str) -> dict:
         git_ref = "master"
         # rpminspect defines its own container in the tmt plan file,
         # hence `compose=None`
-        payload = self._get_tf_base_payload(distro, None)
+        payload = self._get_tf_base_payload(distro, None, with_artifacts=False)
         payload["test"] = {
             "tmt": {
                 "url": git_repo,
@@ -1562,7 +1562,7 @@ def _payload_rpmlint(self, distro: str, compose: str) -> dict:
         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 = self._get_tf_base_payload(distro, None, with_artifacts=False)
         payload["test"] = {
             "tmt": {
                 "url": git_repo,
@@ -1583,7 +1583,7 @@ def _get_fedora_ci_payload(self, distro: str, plan: str) -> dict:
         git_repo = "https://forge.fedoraproject.org/ci/shared-tests"
         git_ref = "main" if self.service_config.deployment == Deployment.prod else "stg"
         # All tests in ci/shared-tests define their own provision hence `compose=None`
-        payload = self._get_tf_base_payload(distro, None)
+        payload = self._get_tf_base_payload(distro, None, with_artifacts=False)
         payload["test"] = {
             "tmt": {
                 "url": git_repo,
@@ -1621,7 +1621,9 @@ def _payload_custom(self, distro: str, compose: str) -> dict:
         }
         return payload
 
-    def _get_tf_base_payload(self, distro: str, compose: Optional[str]) -> dict:
+    def _get_tf_base_payload(
+        self, distro: str, compose: Optional[str], with_artifacts: bool = True
+    ) -> dict:
         """
         Common payload for all fedora-ci testing-farm jobs.
 
@@ -1637,7 +1639,9 @@ def _get_tf_base_payload(self, distro: str, compose: Optional[str]) -> dict:
         artifacts = []
         if self.koji_build:
             variables["KOJI_TASK_ID"] = self.koji_build.task_id
-            artifacts.append({"id": self.koji_build.task_id, "type": "fedora-koji-build"})
+            # TODO: Drop this check with the switch to multihost-pipeline
+            if with_artifacts:
+                artifacts.append({"id": self.koji_build.task_id, "type": "fedora-koji-build"})
 
         context = {
             "distro": distro,

tests/integration/test_listen_to_fedmsg.py

@@ -2676,38 +2676,46 @@ def test_koji_build_end_downstream(
     koji_build_pr_downstream.should_receive("set_status").with_args("success").once()
     koji_build_pr_downstream.should_receive("set_build_logs_urls")
     koji_build_pr_downstream.should_receive("set_web_url")
-    common_payload_no_compose = {
-        "environments": [
-            {
-                "arch": "x86_64",
-                "variables": {
-                    "KOJI_TASK_ID": "1",
-                },
-                "artifacts": [
-                    {
-                        "id": "1",
-                        "type": "fedora-koji-build",
+
+    def _common_payload(*, with_compose: bool, with_artifact: bool):
+        _payload = {
+            "environments": [
+                {
+                    "arch": "x86_64",
+                    "variables": {
+                        "KOJI_TASK_ID": "1",
                     },
-                ],
-                "tmt": {
-                    "context": {
-                        "distro": distro,
-                        "arch": "x86_64",
-                        "trigger": "commit",
-                        "initiator": "fedora-ci",
-                        "dist-git-branch": "rawhide",
-                        **extra_context,
+                    "artifacts": [],
+                    "tmt": {
+                        "context": {
+                            "distro": distro,
+                            "arch": "x86_64",
+                            "trigger": "commit",
+                            "initiator": "fedora-ci",
+                            "dist-git-branch": "rawhide",
+                            **extra_context,
+                        },
                     },
                 },
+            ],
+            "notification": {
+                "webhook": {
+                    "url": "https://stg.packit.dev/api/testing-farm/results",
+                    "token": "secret token",
+                },
             },
-        ],
-        "notification": {
-            "webhook": {
-                "url": "https://stg.packit.dev/api/testing-farm/results",
-                "token": "secret token",
-            },
-        },
-    }
+        }
+        assert isinstance(_payload["environments"], list)  # narrow type
+        if with_artifact:
+            _payload["environments"][0]["artifacts"] = [
+                {
+                    "id": "1",
+                    "type": "fedora-koji-build",
+                }
+            ]
+        if with_compose:
+            _payload["environments"][0]["os"] = {"compose": compose}
+        return _payload
 
     installability_repo = "https://github.com/fedora-ci/installability-pipeline.git"
     payload_installability = {
@@ -2717,10 +2725,8 @@ def test_koji_build_end_downstream(
                 "ref": "master",
             },
         },
-        **common_payload_no_compose,
+        **_common_payload(with_compose=True, with_artifact=False),
     }
-    payload_installability = copy.deepcopy(payload_installability)
-    payload_installability["environments"][0]["os"] = {"compose": compose}
 
     rpminspect_repo = "https://github.com/fedora-ci/rpminspect-pipeline.git"
     payload_rpminspect = {
@@ -2730,7 +2736,7 @@ def test_koji_build_end_downstream(
                 "ref": "master",
             },
         },
-        **common_payload_no_compose,
+        **_common_payload(with_compose=False, with_artifact=False),
     }
 
     rpmlint_repo = "https://github.com/packit/tmt-plans.git"
@@ -2743,7 +2749,7 @@ def test_koji_build_end_downstream(
                 "name": "/plans/rpmlint",
             },
         },
-        **common_payload_no_compose,
+        **_common_payload(with_compose=False, with_artifact=False),
     }
 
     shared_tests_repo = "https://forge.fedoraproject.org/ci/shared-tests"
@@ -2756,7 +2762,7 @@ def test_koji_build_end_downstream(
                 "name": "/rmdepcheck",
             },
         },
-        **common_payload_no_compose,
+        **_common_payload(with_compose=False, with_artifact=False),
     }
 
     payload_license_validate = {
@@ -2767,7 +2773,7 @@ def test_koji_build_end_downstream(
                 "name": "/license-validate",
             },
         },
-        **common_payload_no_compose,
+        **_common_payload(with_compose=False, with_artifact=False),
     }
 
     payload_custom = {
@@ -2777,37 +2783,7 @@ def test_koji_build_end_downstream(
                 "ref": "0011223344",
             },
         },
-        "environments": [
-            {
-                "arch": "x86_64",
-                "os": {"compose": compose},
-                "variables": {
-                    "KOJI_TASK_ID": "1",
-                },
-                "artifacts": [
-                    {
-                        "id": "1",
-                        "type": "fedora-koji-build",
-                    },
-                ],
-                "tmt": {
-                    "context": {
-                        "distro": distro,
-                        "arch": "x86_64",
-                        "trigger": "commit",
-                        "initiator": "fedora-ci",
-                        "dist-git-branch": "rawhide",
-                        **extra_context,
-                    },
-                },
-            },
-        ],
-        "notification": {
-            "webhook": {
-                "url": "https://stg.packit.dev/api/testing-farm/results",
-                "token": "secret token",
-            },
-        },
+        **_common_payload(with_compose=True, with_artifact=True),
     }
 
     flexmock(aliases).should_receive("get_aliases").and_return({"fedora-all": [], "epel-all": []})