From 43cc86dc8ff206ab557ab88be814cd265cafb912 Mon Sep 17 00:00:00 2001 From: Cagri Yonca Date: Tue, 27 May 2025 13:19:06 +0200 Subject: [PATCH 1/2] fix/tekton: updated currency generation Signed-off-by: Cagri Yonca --- .tekton/.currency/scripts/generate_report.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.tekton/.currency/scripts/generate_report.py b/.tekton/.currency/scripts/generate_report.py index 8b5a1667..15b1c98d 100644 --- a/.tekton/.currency/scripts/generate_report.py +++ b/.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,19 @@ 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: + 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 +249,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 From 05d9675ade65ba97e4e7bbf58b93b8117f402476 Mon Sep 17 00:00:00 2001 From: Cagri Yonca Date: Tue, 10 Jun 2025 11:42:57 +0200 Subject: [PATCH 2/2] chore: debugging Signed-off-by: Cagri Yonca --- .tekton/.currency/scripts/generate_report.py | 1 + tests/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.tekton/.currency/scripts/generate_report.py b/.tekton/.currency/scripts/generate_report.py index 15b1c98d..dcc21d20 100644 --- a/.tekton/.currency/scripts/generate_report.py +++ b/.tekton/.currency/scripts/generate_report.py @@ -170,6 +170,7 @@ def get_taskruns(namespace, task_name, taskrun_filter, is_default_task=False): 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, diff --git a/tests/requirements.txt b/tests/requirements.txt index b4b257d8..b5781c19 100644 --- a/tests/requirements.txt +++ b/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