@@ -1526,7 +1526,7 @@ def prepare_and_send_tf_request(
15261526 def _payload_installability (self , distro : str , compose : str ) -> dict :
15271527 git_repo = "https://github.com/fedora-ci/installability-pipeline.git"
15281528 git_ref = "master"
1529- payload = self ._get_tf_base_payload (distro , compose )
1529+ payload = self ._get_tf_base_payload (distro , compose , with_artifacts = False )
15301530 payload ["test" ] = {
15311531 "tmt" : {
15321532 "url" : git_repo ,
@@ -1544,7 +1544,7 @@ def _payload_rpminspect(self, distro: str, compose: str) -> dict:
15441544 git_ref = "master"
15451545 # rpminspect defines its own container in the tmt plan file,
15461546 # hence `compose=None`
1547- payload = self ._get_tf_base_payload (distro , None )
1547+ payload = self ._get_tf_base_payload (distro , None , with_artifacts = False )
15481548 payload ["test" ] = {
15491549 "tmt" : {
15501550 "url" : git_repo ,
@@ -1562,7 +1562,7 @@ def _payload_rpmlint(self, distro: str, compose: str) -> dict:
15621562 git_ref = "main"
15631563 # rpmlint defines its own container in the tmt plan file,
15641564 # hence `compose=None`
1565- payload = self ._get_tf_base_payload (distro , None )
1565+ payload = self ._get_tf_base_payload (distro , None , with_artifacts = False )
15661566 payload ["test" ] = {
15671567 "tmt" : {
15681568 "url" : git_repo ,
@@ -1583,7 +1583,7 @@ def _get_fedora_ci_payload(self, distro: str, plan: str) -> dict:
15831583 git_repo = "https://forge.fedoraproject.org/ci/shared-tests"
15841584 git_ref = "main" if self .service_config .deployment == Deployment .prod else "stg"
15851585 # All tests in ci/shared-tests define their own provision hence `compose=None`
1586- payload = self ._get_tf_base_payload (distro , None )
1586+ payload = self ._get_tf_base_payload (distro , None , with_artifacts = False )
15871587 payload ["test" ] = {
15881588 "tmt" : {
15891589 "url" : git_repo ,
@@ -1621,7 +1621,9 @@ def _payload_custom(self, distro: str, compose: str) -> dict:
16211621 }
16221622 return payload
16231623
1624- def _get_tf_base_payload (self , distro : str , compose : Optional [str ]) -> dict :
1624+ def _get_tf_base_payload (
1625+ self , distro : str , compose : Optional [str ], with_artifacts : bool = True
1626+ ) -> dict :
16251627 """
16261628 Common payload for all fedora-ci testing-farm jobs.
16271629
@@ -1637,7 +1639,9 @@ def _get_tf_base_payload(self, distro: str, compose: Optional[str]) -> dict:
16371639 artifacts = []
16381640 if self .koji_build :
16391641 variables ["KOJI_TASK_ID" ] = self .koji_build .task_id
1640- artifacts .append ({"id" : self .koji_build .task_id , "type" : "fedora-koji-build" })
1642+ # TODO: Drop this check with the switch to multihost-pipeline
1643+ if with_artifacts :
1644+ artifacts .append ({"id" : self .koji_build .task_id , "type" : "fedora-koji-build" })
16411645
16421646 context = {
16431647 "distro" : distro ,
0 commit comments