fix/tekton: updated currency generation

.tekton/.currency/scripts/generate_report.py

@@ -146,7 +146,7 @@ def is_up_to_date(
     return up_to_date, days_behind
 
 
-def get_taskruns(namespace, task_name, taskrun_filter):
+def get_taskruns(namespace, task_name, taskrun_filter, is_default_task=False):
     """Get sorted taskruns filtered based on label_selector"""
     group = "tekton.dev"
     version = "v1"
@@ -167,6 +167,20 @@ def get_taskruns(namespace, task_name, taskrun_filter):
         key=lambda tr: tr["metadata"]["creationTimestamp"], reverse=True
     )
 
+    name_pattern = re.compile(r".*-(\d+)$")
+
+    if is_default_task:
+        print(filtered_taskruns)
+        filtered_taskruns.sort(
+            key=lambda tr: int(name_pattern.search(tr["metadata"]["name"]).group(1)),
+            reverse=True,
+        )
+    else:
+        filtered_taskruns.sort(
+            key=lambda tr: tr["metadata"]["creationTimestamp"],
+            reverse=True,
+        )
+
     return filtered_taskruns
 
 
@@ -236,7 +250,9 @@ def get_tekton_ci_output():
         lambda tr: tr["metadata"]["name"].endswith("unittest-default-3")
         and tr["status"]["conditions"][0]["type"] == "Succeeded"
     )
-    default_taskruns = get_taskruns(namespace, task_name, taskrun_filter)
+    default_taskruns = get_taskruns(
+        namespace, task_name, taskrun_filter, is_default_task=True
+    )
 
     tekton_ci_output = process_taskrun_logs(
         default_taskruns, core_v1_client, namespace, task_name, tekton_ci_output

tests/requirements.txt

@@ -1,7 +1,8 @@
 -r requirements-minimal.txt
 aioamqp>=0.15.0
 aiofiles>=0.5.0
-aiohttp>=3.8.3
+aiohttp<=3.10.11; python_version <= "3.8"
+aiohttp>=3.10.11; python_version > "3.8"
 boto3>=1.17.74
 bottle>=0.12.25
 celery>=5.2.7