Skip to content

Commit

Permalink
[infra] Migrate linux-official builder GN args to starlark.
Browse files Browse the repository at this point in the history
This change specifies GN args for linux-official ci and try
builders using the gn_args starlark library.

Cq-Include-Trybots: chromium/try:linux-official
Bug: 1471251
Change-Id: I8d74c12382e00eef88cf3dee82be61cda103187a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4792342
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Garrett Beaty <gbeaty@google.com>
Auto-Submit: Keybo Qian <keybo@google.com>
Cr-Commit-Position: refs/heads/main@{#1200516}
  • Loading branch information
Keybo Qian authored and Chromium LUCI CQ committed Sep 22, 2023
1 parent fdcc1b7 commit 0654b02
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 17 deletions.
1 change: 1 addition & 0 deletions infra/config/dev/dev.star
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,6 @@ luci.builder.defaults.test_presentation.set(resultdb.test_presentation(grouping_
exec("//dev/swarming.star")

exec("//recipes.star")
exec("//gn_args/gn_args.star")

exec("//dev/subprojects/chromium/subproject.star")
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"gn_args": {
"is_official_build": true,
"use_remoteexec": true
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"$build/chromium_tests_builder_config": {
"builder_config": {
"additional_exclusions": [
"infra/config/generated/builders/ci/linux-official/gn-args.json"
],
"builder_db": {
"entries": [
{
Expand Down
9 changes: 8 additions & 1 deletion infra/config/generated/builders/gn_args_locations.json
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
{}
{
"chromium": {
"linux-official": "ci/linux-official/gn-args.json"
},
"tryserver.chromium": {
"linux-official": "try/linux-official/gn-args.json"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"gn_args": {
"dcheck_always_on": true,
"is_official_build": true,
"symbol_level": 1,
"use_remoteexec": true
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"$build/chromium_tests_builder_config": {
"builder_config": {
"additional_exclusions": [
"infra/config/generated/builders/try/linux-official/gn-args.json"
],
"builder_db": {
"entries": [
{
Expand Down
43 changes: 43 additions & 0 deletions infra/config/gn_args/gn_args.star
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Copyright 2023 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# Execute this file to set up some common GN arg configs for Chromium builders.

load("//lib/gn_args.star", "gn_args")

gn_args.config(
"official_optimize",
args = {
"is_official_build": True,
},
)

gn_args.config(
"reclient",
args = {
"use_remoteexec": True,
},
)

gn_args.config(
"minimal_symbols",
args = {
"symbol_level": 1,
},
)

gn_args.config(
"dcheck_always_on",
args = {
"dcheck_always_on": True,
},
)

gn_args.config(
"try_builder",
configs = [
"minimal_symbols",
"dcheck_always_on",
],
)
1 change: 1 addition & 0 deletions infra/config/main.star
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ luci.builder.defaults.test_presentation.set(resultdb.test_presentation(grouping_
exec("//swarming.star")

exec("//recipes.star")
exec("//gn_args/gn_args.star")
exec("//targets/mixins.star")
exec("//targets/targets.star")
exec("//targets/variants.star")
Expand Down
4 changes: 4 additions & 0 deletions infra/config/subprojects/chromium/ci/chromium.star
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ load("//lib/builders.star", "cpu", "os", "reclient", "sheriff_rotations")
load("//lib/branches.star", "branches")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//lib/gn_args.star", "gn_args")

ci.defaults.set(
executable = ci.DEFAULT_EXECUTABLE,
Expand Down Expand Up @@ -485,6 +486,9 @@ ci.builder(
short_name = "off",
),
execution_timeout = 7 * time.hour,
gn_args = gn_args.config(
configs = ["official_optimize", "reclient"],
),
health_spec = health_spec.modified_default(
build_time = struct(
p50_mins = 240,
Expand Down
4 changes: 4 additions & 0 deletions infra/config/subprojects/chromium/try/tryserver.chromium.star
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ load("//lib/branches.star", "branches")
load("//lib/builders.star", "cpu", "os", "reclient")
load("//lib/try.star", "try_")
load("//lib/consoles.star", "consoles")
load("//lib/gn_args.star", "gn_args")

try_.defaults.set(
executable = try_.DEFAULT_EXECUTABLE,
Expand Down Expand Up @@ -52,6 +53,9 @@ try_.builder(
mirrors = [
"ci/linux-official",
],
gn_args = gn_args.config(
configs = ["ci/linux-official", "try_builder"],
),
)

try_.builder(
Expand Down
2 changes: 0 additions & 2 deletions tools/mb/mb_config.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
'linux-archive-rel': 'linux_archive_release_bot_reclient',
'linux-chromeos-archive-rel': 'chromeos_with_codecs_release_bot_reclient',
'linux-lacros-archive-rel': 'lacros_on_linux_release_bot_reclient',
'linux-official': 'official_optimize_reclient',
'mac-archive-rel': 'release_bot_mac_strip_minimal_symbols_reclient',
'mac-arm64-archive-rel': 'release_bot_mac_strip_minimal_symbols_arm64_reclient',
'mac-official': 'official_optimize_reclient',
Expand Down Expand Up @@ -1039,7 +1038,6 @@
'tryserver.chromium': {
'android-official': 'android_official_optimize_reclient_trybot',
'fuchsia-official': 'fuchsia_official_optimize_reclient_trybot',
'linux-official': 'official_optimize_reclient_trybot',
'mac-official': 'official_optimize_reclient_trybot',
'win-official': 'official_optimize_reclient_trybot',
'win32-official': 'x86_official_optimize_reclient_trybot',
Expand Down
6 changes: 0 additions & 6 deletions tools/mb/mb_config_expectations/chromium.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@
"use_remoteexec": true
}
},
"linux-official": {
"gn_args": {
"is_official_build": true,
"use_remoteexec": true
}
},
"mac-archive-rel": {
"gn_args": {
"dcheck_always_on": false,
Expand Down
8 changes: 0 additions & 8 deletions tools/mb/mb_config_expectations/tryserver.chromium.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
"use_remoteexec": true
}
},
"linux-official": {
"gn_args": {
"dcheck_always_on": true,
"is_official_build": true,
"symbol_level": 1,
"use_remoteexec": true
}
},
"mac-official": {
"gn_args": {
"dcheck_always_on": true,
Expand Down

0 comments on commit 0654b02

Please sign in to comment.