contest: status: break down flakiness query by week (not 2 weeks)

Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

contest/backend/query.py

@@ -245,10 +245,11 @@ def flaky_tests():
 
     print(f"Query for flaky tests took: {str(datetime.datetime.now() - t)}")
 
-    target_date = datetime.datetime.now() - datetime.timedelta(days=14)
-    two_weeks = target_date.strftime("%Y-%m-%d--%H-%M")
-    target_date = datetime.datetime.now() - datetime.timedelta(days=28)
-    four_weeks = target_date.strftime("%Y-%m-%d--%H-%M")
+    weeks_ago = []
+    for weeks in range(1, 5):
+        target_date = datetime.datetime.now() - datetime.timedelta(weeks=weeks)
+        weeks_ago.append(target_date.strftime("%Y-%m-%d--%H-%M"))
+
     cnt = 0
     res = {}
     for row in rows:
@@ -258,13 +259,14 @@ def flaky_tests():
             res[key] = res.get(key, 0) + 1
         else:
             if key not in res:
-                res[key] = [0, 0]
-            if br_date >= two_weeks:
-                res[key][0] += 1
-            elif br_date >= four_weeks:
-                res[key][1] += 1
+                res[key] = [0, 0, 0, 0]
+
+            for i in range(len(weeks_ago)):
+                if br_date >= weeks_ago[i]:
+                    res[key][i] += 1
+                    break
             else:
-                break
+                break  # stop looking at rows, the records are sorted by date
         cnt += 1
     # JSON needs a simple array, not a dict
     data = []

ui/status.html

@@ -59,8 +59,7 @@ <h3>Flakiest tests</h3>
                 <th>Remote</th>
                 <th>Executor</th>
                 <th>Test</th>
-                <th>Flakes (now - 2w)</th>
-                <th>Flakes (2w - 4w)</th>
+                <th colspan="4">Flakes (by week: this, 1, 2, 3 ago)</th>
 		<th>Ignored</th>
             </tr>
         </table>

ui/status.js

@@ -1014,6 +1014,8 @@ function flakes_doit(data_raw)
 	    return b["count"][0] - a["count"][0];
 	if (a["count"][1] != b["count"][1])
 	    return b["count"][1] - a["count"][1];
+	if (a["count"][2] != b["count"][2])
+	    return b["count"][2] - a["count"][2];
 	return 0;
     })
 
@@ -1022,7 +1024,7 @@ function flakes_doit(data_raw)
 	let reported = nipa_pw_reported(v, v);
 	let ignored = "";
 
-	if (v["count"][0] < 3 && reported)
+	if (v["count"][0] + v["count"][1] + v["count"][2] < 4 && reported)
 	    return 1;
 	if (!reported)
 	    ignored = "yes";
@@ -1032,7 +1034,9 @@ function flakes_doit(data_raw)
 	row.insertCell(2).innerText = v["test"];
 	row.insertCell(3).innerText = v["count"][0];
 	row.insertCell(4).innerText = v["count"][1];
-	row.insertCell(5).innerText = ignored;
+	row.insertCell(5).innerText = v["count"][2];
+	row.insertCell(6).innerText = v["count"][3];
+	row.insertCell(7).innerText = ignored;
     });
 }