Merge pull request #2227 from cms-sw/es-4-week-index

use 4 week indexes for ES

cmssw_known_errors.py

@@ -175,14 +175,15 @@
     "10805.31": {"step": 3, "exitcode": 16640, "reason": MSG_TRITON_INCOMPETIBILITY},
 }
 
-#14 and above
+# 14 and above
 RelFilter = "CMSSW_(14|1[5-9]|[2-9][0-9]|[1-9][0-9][0-9]+)_.+"
 KNOWN_ERRORS["relvals"][RelFilter] = {}
 KNOWN_ERRORS["relvals"][RelFilter][".+_(aarch64|ppc64le)_.+"] = {
     "180.1": {"step": 3, "exitcode": 16640, "reason": MSG_TRITON_INCOMPETIBILITY},
     "181.1": {"step": 3, "exitcode": 16640, "reason": MSG_TRITON_INCOMPETIBILITY},
 }
 
+
 def get_known_errors(release, architecture, test_type):
     if not test_type in KNOWN_ERRORS:
         return {}

cmsutils.py

@@ -139,11 +139,14 @@ def getIBReleaseInfo(rel):
     return (rc, day, hour)
 
 
-def cmsswIB2Week(release):
+def cmsswIB2Week(release, week_offset=4):
     from datetime import datetime
 
     rel_sec = int(datetime.strptime(release.split("_")[-1], "%Y-%m-%d-%H%M").strftime("%s"))
-    return (str(int(((rel_sec / 86400) + 4) / 7)), rel_sec)
+    week = int(((rel_sec / 86400) + 4) / 7)
+    if week_offset > 1:
+        week = week - (week % week_offset)
+    return (str(week), rel_sec)
 
 
 #

report-summary-merged-prs.py

@@ -1079,6 +1079,7 @@ def find_one_vtune_result(magic_command):
     print("inprogress")
     return "inprogress"
 
+
 def find_general_test_results(
     test_field, comparisons, architecture, magic_command, results_function=find_one_test_results
 ):