From 079bbe99e0419369c3b2cb63f98a571434ddba51 Mon Sep 17 00:00:00 2001
From: Dennis Kempin <denniskempin@google.com>
Date: Fri, 3 Jun 2022 20:17:04 +0000
Subject: [PATCH] infra: Update merge builder to run periodically

The Infra console view is replaced with a list view, since
the builds are no longer just post submit builds.

BUG=b:233913643
TEST=lucicfg validate main.star

Change-Id: Ia1ccc75251ccdb7ae567418235e2bf8b7d6aa16a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3692687
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
---
 infra/config/generated/cr-buildbucket.cfg | 21 +++++++++++++++
 infra/config/generated/luci-milo.cfg      |  7 ++---
 infra/config/generated/luci-scheduler.cfg | 11 ++++++++
 infra/config/main.star                    | 32 +++++++++++++----------
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index e671d1cc57..1b80ea9c5d 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -144,6 +144,27 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "crosvm_update_chromeos_merges"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.crosvm.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "recipe": "update_chromeos_merges"'
+        '}'
+      service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
   }
 }
 buckets {
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index 93a73554c1..429f12adc0 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -34,10 +34,11 @@ consoles {
 consoles {
   id: "Infra"
   name: "Infra"
-  repo_url: "https://chromium.googlesource.com/crosvm/crosvm"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.crosvm.ci/crosvm_push_to_github"
   }
+  builders {
+    name: "buildbucket/luci.crosvm.ci/crosvm_update_chromeos_merges"
+  }
+  builder_view_only: true
 }
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index e9cb0cb968..c7af1abd82 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -64,6 +64,17 @@ job {
     builder: "crosvm_push_to_github"
   }
 }
+job {
+  id: "crosvm_update_chromeos_merges"
+  realm: "ci"
+  schedule: "0,30 * * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "crosvm_update_chromeos_merges"
+  }
+}
 trigger {
   id: "main source"
   realm: "ci"
diff --git a/infra/config/main.star b/infra/config/main.star
index c5a087019b..c93d057c4d 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -132,10 +132,9 @@ luci.console_view(
     repo = "https://chromium.googlesource.com/crosvm/crosvm",
 )
 
-# Console showing all postsubmit infra builders
-luci.console_view(
+# View showing all infra builders
+luci.list_view(
     name = "Infra",
-    repo = "https://chromium.googlesource.com/crosvm/crosvm",
 )
 
 def verify_builder(name, dimensions, presubmit = True, postsubmit = True, **args):
@@ -233,13 +232,14 @@ def verify_chromeos_builder(board, **kwargs):
         **kwargs
     )
 
-def infra_builder(name, **args):
+def infra_builder(name, postsubmit, **args):
     """Creates a ci job to run infra recipes that are not involved in verifying changes.
 
     The builders are added to a separate infra dashboard.
 
     Args:
         name: Name of the builder
+        postsubmit: True if the builder should run after each submitted commit.
         **args: Passed to luci.builder
     """
     luci.builder(
@@ -253,14 +253,15 @@ def infra_builder(name, **args):
         },
         **args
     )
-    luci.gitiles_poller(
-        name = "main source",
-        bucket = "ci",
-        repo = "https://chromium.googlesource.com/crosvm/crosvm",
-        triggers = ["ci/%s" % name],
-    )
-    luci.console_view_entry(
-        console_view = "Infra",
+    if postsubmit:
+        luci.gitiles_poller(
+            name = "main source",
+            bucket = "ci",
+            repo = "https://chromium.googlesource.com/crosvm/crosvm",
+            triggers = ["ci/%s" % name],
+        )
+    luci.list_view_entry(
+        list_view = "Infra",
         builder = "ci/%s" % name,
     )
 
@@ -286,11 +287,14 @@ infra_builder(
     executable = luci.recipe(
         name = "push_to_github",
     ),
+    postsubmit = True,
 )
 
 infra_builder(
-    name = "crosvm_merge_into_chromeos",
+    name = "crosvm_update_chromeos_merges",
     executable = luci.recipe(
-        name = "merge_into_chromeos",
+        name = "update_chromeos_merges",
     ),
+    schedule = "0,30 * * * *",  # Run every 30 minutes
+    postsubmit = False,
 )