Merge "fix --ci-mode benchmarks" into main

2 files changed, 11 insertions, 15 deletions

diff --git a/scripts/incremental_build/cuj_catalog.py b/scripts/incremental_build/cuj_catalog.py
index 5c8eb835..26866fc4 100644
--- a/scripts/incremental_build/cuj_catalog.py
+++ b/scripts/incremental_build/cuj_catalog.py
@@ -19,13 +19,11 @@ import shutil
 import tempfile
 import uuid
 from pathlib import Path
-from typing import Callable, Final
-from typing import Optional
+from typing import Callable, Final, Optional
 
 import clone
 import cuj
 import finder
-import ui
 import util
 import random
 import re
@@ -44,14 +42,6 @@ would like the metrics to be collated in the metrics.csv file, use
 """
 
 
-class Warmup(CujGroup):
-    def __init__(self):
-        super().__init__("WARMUP")
-
-    def get_steps(self) -> list[CujStep]:
-        return [CujStep("", lambda: None)]
-
-
 class Clean(CujGroup):
     def __init__(self):
         super().__init__("clean")
@@ -64,10 +54,16 @@ class Clean(CujGroup):
         return [CujStep("", clean)]
 
 
-class NoChange(Warmup):
+class NoChange(CujGroup):
     def __init__(self):
-        super().__init__()
-        self._desc = "no change"
+        super().__init__("no change")
+
+    def get_steps(self) -> list[CujStep]:
+        return [CujStep("", lambda: None)]
+
+
+Warmup: Final[CujGroup] = NoChange()
+Warmup._desc = "WARMUP"
 
 
 class Modify(CujGroup):
diff --git a/scripts/incremental_build/incremental_build.py b/scripts/incremental_build/incremental_build.py
index e9f4591a..5203ca03 100644
--- a/scripts/incremental_build/incremental_build.py
+++ b/scripts/incremental_build/incremental_build.py
@@ -347,7 +347,7 @@ def main():
         util.CURRENT_BUILD_TYPE = build_type
         # warm-up run reduces variations attributable to OS caches
         if user_input.chosen_cujgroups and not user_input.no_warmup:
-            run_cuj_group(cuj_catalog.Warmup())
+            run_cuj_group(cuj_catalog.Warmup)
         for i in user_input.chosen_cujgroups:
             run_cuj_group(cuj_catalog.get_cujgroups()[i])
     _display(r"^(?:time|bp2build|soong_build/\*\.bazel)$")