opentf-toolkit-nightly 0.55.0.dev970__py3-none-any.whl → 0.55.0.dev977__py3-none-any.whl

opentf/commons/datasources.py

@@ -126,7 +126,9 @@ def _has_testresult(item: Dict[str, Any]) -> bool:
 
 
 def _get_workflow_jobs(events: List[Dict[str, Any]]) -> Dict[str, Any]:
-    """yada
+    """Get workflow jobs that have steps.
+
+    TOTO Will have to be reviewed when adding nested generators.
 
     # Required parameters
 
@@ -136,14 +138,32 @@ def _get_workflow_jobs(events: List[Dict[str, Any]]) -> Dict[str, Any]:
 
     A dictionary.  Keys are job names, values are a (dict, event) pair.
 
-    _event_ is either a workflow or a generatorresult event.
+    - name: a string, the job's name and the generator's job_id, if any
+    - job: a dictionary (its `runs-on` entry is a list of strings)
+    - event: either a workflow or a generatorresult event.
     """
-    return {
-        job_name + ' ' + event['metadata'].get('job_id', ''): (job, event)
+
+    def _clean(j):
+        j['runs-on'] = _as_list(j.get('runs-on', []))
+        return j
+
+    jobs = {
+        job_name + ' ' + event['metadata'].get('job_id', ''): (_clean(job), event)
         for event in filter(lambda x: x['kind'] in (WORKFLOW, GENERATORRESULT), events)
         for job_name, job in event.get('jobs', {}).items()
-        if job.get('steps')
     }
+    for job_name, (job, event) in jobs.items():
+        if ' ' not in job_name.strip():
+            # we do not have to patch top-level jobs
+            continue
+        if not event['metadata']['job_origin']:
+            job['runs-on'] = list(
+                set(
+                    job['runs-on'] + jobs[event['metadata']['name'] + ' '][0]['runs-on']
+                )
+            )
+
+    return {name: (job, event) for name, (job, event) in jobs.items() if 'steps' in job}
 
 
 def _uses_inception(events: List[Dict[str, Any]]) -> bool:
@@ -307,7 +327,7 @@ def _create_testresult_labels(
         'test': {
             'job': job_name.split()[0],
             'managed': False,
-            'runs-on': _as_list(job['runs-on']),
+            'runs-on': job['runs-on'],
             'technology': exec_step['uses'].partition('/')[0],
             'test': exec_step.get('with', {}).get('test'),
             'uses': exec_step['uses'],

{opentf_toolkit_nightly-0.55.0.dev970.dist-info → opentf_toolkit_nightly-0.55.0.dev977.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.55.0.dev970
+Version: 0.55.0.dev977
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.55.0.dev970.dist-info → opentf_toolkit_nightly-0.55.0.dev977.dist-info}/RECORD

@@ -1,7 +1,7 @@
 opentf/commons/__init__.py,sha256=KRY8ShQw_0ZZ0oEOiKi4-xnWofE_QsFjEe1T8wUxJ-w,21952
 opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
 opentf/commons/config.py,sha256=GmvInVnUsXIwlNfgTQeQ_pPs97GeGTGn2S2QZEFwss8,7828
-opentf/commons/datasources.py,sha256=8qWC6KFiFGiIOEH7FGdbP_4hd_gVJFxbpR-051rhNZI,24452
+opentf/commons/datasources.py,sha256=So0G1AURM7ceo93qom6Gfs73BW0924vmgcrt9iOrPZs,25224
 opentf/commons/expressions.py,sha256=A68F27Our8oVVphUrRvB5haSlqj2YCrH2OxHPNLBio4,19251
 opentf/commons/pubsub.py,sha256=7khxAHVZiwJRcwIBJ6MPR-f3xY9144-2eNLROwq5F-4,5894
 opentf/commons/schemas.py,sha256=lokZCU-wmsIkzVA-TVENtC7Io_GmYxrP-FQaOOowg4s,4044
@@ -48,8 +48,8 @@ opentf/scripts/startup.py,sha256=Da2zo93pBWbdRmj-wgekgLcF94rpNc3ZkbvR8R0w8XY,212
 opentf/toolkit/__init__.py,sha256=g3DiTZlSvvzZWKgM8qU47muLqjQrpWZ6M6PWZ-sBsvQ,19610
 opentf/toolkit/channels.py,sha256=Cng3b4LUsxvCHUbp_skys9CFcKZMfcKhA_ODg_EAlIE,17156
 opentf/toolkit/core.py,sha256=L1fT4YzwZjqE7PUXhJL6jSVQge3ohBQv5UBb9DAC6oo,9320
-opentf_toolkit_nightly-0.55.0.dev970.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.55.0.dev970.dist-info/METADATA,sha256=HtsZubZUG9Sh90pvArtKrIISBBZIqzv3dvsbuCvpoLI,1945
-opentf_toolkit_nightly-0.55.0.dev970.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-opentf_toolkit_nightly-0.55.0.dev970.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.55.0.dev970.dist-info/RECORD,,
+opentf_toolkit_nightly-0.55.0.dev977.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.55.0.dev977.dist-info/METADATA,sha256=xWNgjta0vy0dCbRpvpu0ACKezcKCX6FCsEEItu_guZo,1945
+opentf_toolkit_nightly-0.55.0.dev977.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+opentf_toolkit_nightly-0.55.0.dev977.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.55.0.dev977.dist-info/RECORD,,