Skip to content

Commit 43cc86d

Browse files
committed
fix/tekton: updated currency generation
Signed-off-by: Cagri Yonca <cagri@ibm.com>
1 parent 51dc750 commit 43cc86d

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

.tekton/.currency/scripts/generate_report.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def is_up_to_date(
146146
return up_to_date, days_behind
147147

148148

149-
def get_taskruns(namespace, task_name, taskrun_filter):
149+
def get_taskruns(namespace, task_name, taskrun_filter, is_default_task=False):
150150
"""Get sorted taskruns filtered based on label_selector"""
151151
group = "tekton.dev"
152152
version = "v1"
@@ -167,6 +167,19 @@ def get_taskruns(namespace, task_name, taskrun_filter):
167167
key=lambda tr: tr["metadata"]["creationTimestamp"], reverse=True
168168
)
169169

170+
name_pattern = re.compile(r".*-(\d+)$")
171+
172+
if is_default_task:
173+
filtered_taskruns.sort(
174+
key=lambda tr: int(name_pattern.search(tr["metadata"]["name"]).group(1)),
175+
reverse=True,
176+
)
177+
else:
178+
filtered_taskruns.sort(
179+
key=lambda tr: tr["metadata"]["creationTimestamp"],
180+
reverse=True,
181+
)
182+
170183
return filtered_taskruns
171184

172185

@@ -236,7 +249,9 @@ def get_tekton_ci_output():
236249
lambda tr: tr["metadata"]["name"].endswith("unittest-default-3")
237250
and tr["status"]["conditions"][0]["type"] == "Succeeded"
238251
)
239-
default_taskruns = get_taskruns(namespace, task_name, taskrun_filter)
252+
default_taskruns = get_taskruns(
253+
namespace, task_name, taskrun_filter, is_default_task=True
254+
)
240255

241256
tekton_ci_output = process_taskrun_logs(
242257
default_taskruns, core_v1_client, namespace, task_name, tekton_ci_output

0 commit comments

Comments
 (0)