[M97][infra] Remove code for setting project_trigger_overrides.

The project_trigger_overrides field has been removed from the chromium_tests properties since the luci_project field has been removed and chromium_tests will now always trigger child builders in the same project as the running builder. (cherry picked from commit 14090d5) Bug: 1306211 Change-Id: I64466e380e786331f3c2b79bfb4250fe265be0e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3533047 Auto-Submit: Garrett Beaty <gbeaty@google.com> Reviewed-by: Stephen Martinis <martiniss@chromium.org> Commit-Queue: Stephen Martinis <martiniss@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#982430} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3539209 Cr-Commit-Position: refs/branch-heads/4692@{#1546} Cr-Branched-From: 038cd96-refs/heads/main@{#938553}
chromium · Mar 21, 2022 · facd471 · facd471
1 parent 6a92827
commit facd471
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 51 deletions.
diff --git a/infra/config/generated/builders/ci/Fuchsia ARM64/properties.json b/infra/config/generated/builders/ci/Fuchsia ARM64/properties.json
@@ -1,9 +1,4 @@
 {
-  "$build/chromium_tests": {
-    "project_trigger_overrides": {
-      "chromium": "chromium-m97"
-    }
-  },
   "$build/goma": {
     "enable_ats": true,
     "jobs": 500,

diff --git a/infra/config/generated/builders/ci/Fuchsia x64/properties.json b/infra/config/generated/builders/ci/Fuchsia x64/properties.json
@@ -1,9 +1,4 @@
 {
-  "$build/chromium_tests": {
-    "project_trigger_overrides": {
-      "chromium": "chromium-m97"
-    }
-  },
   "$build/goma": {
     "enable_ats": true,
     "jobs": 500,

diff --git a/infra/config/generated/builders/ci/fuchsia-arm64-cast/properties.json b/infra/config/generated/builders/ci/fuchsia-arm64-cast/properties.json
@@ -1,9 +1,4 @@
 {
-  "$build/chromium_tests": {
-    "project_trigger_overrides": {
-      "chromium": "chromium-m97"
-    }
-  },
   "$build/goma": {
     "enable_ats": true,
     "jobs": 500,

diff --git a/infra/config/generated/builders/ci/fuchsia-official/properties.json b/infra/config/generated/builders/ci/fuchsia-official/properties.json
@@ -1,9 +1,4 @@
 {
-  "$build/chromium_tests": {
-    "project_trigger_overrides": {
-      "chromium": "chromium-m97"
-    }
-  },
   "$build/goma": {
     "enable_ats": true,
     "rpc_extra_params": "?prod",

diff --git a/infra/config/generated/builders/ci/fuchsia-x64-cast/properties.json b/infra/config/generated/builders/ci/fuchsia-x64-cast/properties.json
@@ -1,9 +1,4 @@
 {
-  "$build/chromium_tests": {
-    "project_trigger_overrides": {
-      "chromium": "chromium-m97"
-    }
-  },
   "$build/goma": {
     "enable_ats": true,
     "jobs": 500,

diff --git a/infra/config/generated/luci/project.cfg b/infra/config/generated/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "chromium-m97"
 access: "group:all"
 lucicfg {
-  version: "1.30.9"
+  version: "1.30.10"
   package_dir: "../.."
   config_dir: "generated/luci"
   entry_point: "main.star"

diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
@@ -201,15 +201,6 @@ _DEFAULT_BUILDERLESS_OS_CATEGORIES = [os_category.LINUX]
 # setting ssd:0 dimension
 _EXCLUDE_BUILDERLESS_SSD_OS_CATEGORIES = [os_category.MAC]
 
-def _chromium_tests_property(*, project_trigger_overrides):
-    chromium_tests = {}
-
-    project_trigger_overrides = defaults.get_value("project_trigger_overrides", project_trigger_overrides)
-    if project_trigger_overrides:
-        chromium_tests["project_trigger_overrides"] = project_trigger_overrides
-
-    return chromium_tests or None
-
 def _goma_property(*, goma_backend, goma_debug, goma_enable_ats, goma_jobs):
     goma_properties = {}
 
@@ -334,7 +325,6 @@ defaults = args.defaults(
     goma_jobs = None,
     list_view = args.COMPUTE,
     os = None,
-    project_trigger_overrides = None,
     pool = None,
     sheriff_rotations = None,
     xcode = None,
@@ -389,7 +379,6 @@ def builder(
         xcode = args.DEFAULT,
         console_view_entry = None,
         list_view = args.DEFAULT,
-        project_trigger_overrides = args.DEFAULT,
         goma_backend = args.DEFAULT,
         goma_debug = args.DEFAULT,
         goma_enable_ats = args.DEFAULT,
@@ -503,11 +492,6 @@ def builder(
         list_view: A string or a list of strings identifying the ID(s) of the
             list view(s) to add an entry to. Supports a module-level default
             that defaults to no list views.
-        project_trigger_overrides: a dict mapping the LUCI projects declared in
-            recipe BotSpecs to the LUCI project to use when triggering builders.
-            When this builder triggers another builder, if the BotSpec for that
-            builder has a LUCI project that is a key in this mapping, the
-            corresponding value will be used instead.
         goma_backend: a member of the `goma.backend` enum indicating the goma
             backend the builder should use. Will be incorporated into the
             '$build/goma' property. By default, considered None.
@@ -665,12 +649,6 @@ def builder(
     if ssd != None:
         dimensions["ssd"] = str(int(ssd))
 
-    chromium_tests = _chromium_tests_property(
-        project_trigger_overrides = project_trigger_overrides,
-    )
-    if chromium_tests != None:
-        properties["$build/chromium_tests"] = chromium_tests
-
     goma_enable_ats = defaults.get_value("goma_enable_ats", goma_enable_ats)
 
     # Enable ATS on linux by default.

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -13,9 +13,6 @@ ci.defaults.set(
     bucket = "ci",
     build_numbers = True,
     cpu = cpu.X86_64,
-    project_trigger_overrides = branches.value({
-        branches.NOT_MAIN: {"chromium": settings.project},
-    }),
     triggered_by = ["chromium-gitiles-trigger"],
 )