bt benchmark: Collect commits to benchmark into a set

[lttng-ci.git] / scripts / babeltrace-benchmark / benchmark.py

diff --git a/scripts/babeltrace-benchmark/benchmark.py b/scripts/babeltrace-benchmark/benchmark.py
index 86a8596a33c4c24acda5c9580ece4d7c9cf18319..d1805cf70941846482714d5acdae21739a6f53c8 100644 (file)
--- a/scripts/babeltrace-benchmark/benchmark.py
+++ b/scripts/babeltrace-benchmark/benchmark.py
@@ -43,6 +43,11 @@ invalid_commits = {
         "8c99128c640cbce71fb8a6caa15e4c672252b662", # Block on configure
         "f3847c753f1b4f12353c38d97b0577d9993d19fb", # Does not build
         "e0111295f17ddfcc33ec771a8deac505473a06ad", # Does not build
+        "d0d4e0ed487ea23aaf0d023513c0a4d86901b79b", # Does not build
+        "c24f7ab4dd9edeb5e50b0070fd9d9e8691057dde", # Does not build
+        "ce67f5614a4db3b2de4d887eca52135b439b4937", # Does not build
+        "80aff5efc66679fd934cef433c0e698694748385", # Does not build
+        "f4f11e84942d36fcc8a597d226928bce2ccac4b3", # Does not build
         }
 
 def json_type(string):
@@ -143,7 +148,7 @@ def get_benchmark_results(client, commit, workdir):
     results = {}
     benchmark_valid = True
     for b_type in BENCHMARK_TYPES:
-        prefix = "/results/benchmarks/babeltrace/{}/".format(b_type)
+        prefix = "/results/benchmarks/babeltrace/{}".format(b_type)
         result_file = get_file(client, prefix, commit, workdir)
         if not result_file:
             """
@@ -389,19 +394,20 @@ def launch_jobs(branches, git_path, wait_for_completion, debug, force):
     Lauch jobs for all missing results.
     """
     client = get_client()
+    commits_to_test = set()
     for branch, cutoff in branches.items():
-        commits = get_git_log(branch, cutoff, git_path)
-
+        commits = [x for x in get_git_log(branch, cutoff, git_path) if x not in invalid_commits]
         with tempfile.TemporaryDirectory() as workdir:
             for commit in commits:
-                if commit in invalid_commits:
-                    continue
                 b_results = get_benchmark_results(client, commit, workdir)[0]
                 if b_results and not force:
                     continue
-                lava_submit.submit(
-                    commit, wait_for_completion=wait_for_completion, debug=debug
-                )
+                commits_to_test.add(commit)
+    for index, commit in enumerate(commits_to_test):
+        print("Job {}/{}".format(index+1, len(commits_to_test)))
+        lava_submit.submit(
+            commit, wait_for_completion=wait_for_completion, debug=debug
+        )
 
 
 def main():