Commit b047e905 authored by Stephanie Kim's avatar Stephanie Kim Committed by Chromium LUCI CQ

linux-warmed-orchestrator builder and trigger_count for try-warmer

linux-warmed-orchestrator triggers linux-warmed if patch requires
compile. Uses a new chromium-mini-orchestrator@ service account.

Pass in trigger_count 2 into try-warmer so there's more led warmer
builds queued up

Bug: 1149606
Change-Id: I15206e501371e1bf20f6af1a821c9441e4363a94
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2572576
Commit-Queue: Stephanie Kim <kimstephanie@google.com>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835812}
parent 3ddd4816
...@@ -1132,6 +1132,10 @@ config_groups { ...@@ -1132,6 +1132,10 @@ config_groups {
} }
builders { builders {
name: "chromium/try/linux-warmed" name: "chromium/try/linux-warmed"
includable_only: true
}
builders {
name: "chromium/try/linux-warmed-orchestrator"
experiment_percentage: 5 experiment_percentage: 5
location_regexp: ".*" location_regexp: ".*"
location_regexp_exclude: ".+/[+]/docs/.+" location_regexp_exclude: ".+/[+]/docs/.+"
......
...@@ -386,6 +386,6 @@ as required builders. ...@@ -386,6 +386,6 @@ as required builders.
* [linux-rel-builderful](https://ci.chromium.org/p/chromium/builders/try/linux-rel-builderful) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-rel-builderful)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-rel-builderful)) * [linux-rel-builderful](https://ci.chromium.org/p/chromium/builders/try/linux-rel-builderful) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-rel-builderful)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-rel-builderful))
* Experiment percentage: 5 * Experiment percentage: 5
* [linux-warmed](https://ci.chromium.org/p/chromium/builders/try/linux-warmed) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-warmed)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-warmed)) * [linux-warmed-orchestrator](https://ci.chromium.org/p/chromium/builders/try/linux-warmed-orchestrator) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-warmed-orchestrator)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-warmed-orchestrator))
* Experiment percentage: 5 * Experiment percentage: 5
...@@ -20208,7 +20208,7 @@ buckets { ...@@ -20208,7 +20208,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"builder_to_warm\":\"linux-warmed\",\"recipe\":\"chromium/try_warmer\"}" properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"builder_to_warm\":\"linux-warmed\",\"recipe\":\"chromium/try_warmer\",\"trigger_count\":2}"
execution_timeout_secs: 300 execution_timeout_secs: 300
build_numbers: YES build_numbers: YES
service_account: "chromium-led-tot-warmer@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-led-tot-warmer@chops-service-accounts.iam.gserviceaccount.com"
...@@ -35049,6 +35049,61 @@ buckets { ...@@ -35049,6 +35049,61 @@ buckets {
} }
} }
} }
builders {
name: "linux-warmed-orchestrator"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.linux\",\"builder_to_trigger\":{\"builder_group\":\"tryserver.chromium.linux\",\"buildername\":\"linux-warmed\"},\"recipe\":\"chromium/mini_orchestrator\"}"
execution_timeout_secs: 14400
expiration_secs: 7200
caches {
name: "win_toolchain"
path: "win_toolchain"
}
build_numbers: YES
service_account: "chromium-mini-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {
value: 5
}
experiments {
key: "chromium.resultdb.result_sink"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "try_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders { builders {
name: "linux-webkit-msan-rel" name: "linux-webkit-msan-rel"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# This is consumed by presubmit checks that need to validate the config # This is consumed by presubmit checks that need to validate the config
{ {
# 61510 (scheduler total) + 344750 (weighted CQ total) # 61510 (scheduler total) + 344575 (weighted CQ total)
# (weighted CQ total) = 6895 (CQ total) * 50 (CQ weight) # (weighted CQ total) = 6891.5 (CQ total) * 50 (CQ weight)
'*weighted total*': 406260, '*weighted total*': 406085,
'scheduler': { 'scheduler': {
'*total*': 61510, '*total*': 61510,
'triggered': { 'triggered': {
...@@ -543,7 +543,7 @@ ...@@ -543,7 +543,7 @@
}, },
}, },
'cq': { 'cq': {
'*total*': 6895, '*total*': 6891.5,
'try/android-binary-size': 150, 'try/android-binary-size': 150,
'try/android-cronet-arm-dbg': 80, 'try/android-cronet-arm-dbg': 80,
'try/android-lollipop-arm-rel': 150, 'try/android-lollipop-arm-rel': 150,
...@@ -593,8 +593,8 @@ ...@@ -593,8 +593,8 @@
'try/linux-rel': 150, 'try/linux-rel': 150,
# 150 jobs x 5% experiment # 150 jobs x 5% experiment
'try/linux-rel-builderful': 7.5, 'try/linux-rel-builderful': 7.5,
# 150 jobs x 5% experiment # 80 jobs x 5% experiment
'try/linux-warmed': 7.5, 'try/linux-warmed-orchestrator': 4,
'try/linux_chromium_asan_rel_ng': 150, 'try/linux_chromium_asan_rel_ng': 150,
'try/linux_chromium_compile_dbg_ng': 150, 'try/linux_chromium_compile_dbg_ng': 150,
'try/linux_chromium_dbg_ng': 80, 'try/linux_chromium_dbg_ng': 80,
......
...@@ -12099,6 +12099,9 @@ consoles { ...@@ -12099,6 +12099,9 @@ consoles {
builders { builders {
name: "buildbucket/luci.chromium.try/linux-warmed" name: "buildbucket/luci.chromium.try/linux-warmed"
} }
builders {
name: "buildbucket/luci.chromium.try/linux-warmed-orchestrator"
}
builders { builders {
name: "buildbucket/luci.chromium.try/linux-webkit-msan-rel" name: "buildbucket/luci.chromium.try/linux-webkit-msan-rel"
} }
...@@ -12950,6 +12953,9 @@ consoles { ...@@ -12950,6 +12953,9 @@ consoles {
builders { builders {
name: "buildbucket/luci.chromium.try/linux-warmed" name: "buildbucket/luci.chromium.try/linux-warmed"
} }
builders {
name: "buildbucket/luci.chromium.try/linux-warmed-orchestrator"
}
builders { builders {
name: "buildbucket/luci.chromium.try/linux-webkit-msan-rel" name: "buildbucket/luci.chromium.try/linux-webkit-msan-rel"
} }
......
...@@ -207,6 +207,7 @@ realms { ...@@ -207,6 +207,7 @@ realms {
name: "try" name: "try"
bindings { bindings {
role: "role/buildbucket.builderServiceAccount" role: "role/buildbucket.builderServiceAccount"
principals: "user:chromium-mini-orchestrator@chops-service-accounts.iam.gserviceaccount.com"
principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com" principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
......
...@@ -117,6 +117,10 @@ build_recipe( ...@@ -117,6 +117,10 @@ build_recipe(
name = "recipe:findit/chromium/update_components", name = "recipe:findit/chromium/update_components",
) )
build_recipe(
name = "recipe:chromium/mini_orchestrator",
)
build_recipe( build_recipe(
name = "recipe:chromium/try_warmer", name = "recipe:chromium/try_warmer",
) )
......
...@@ -2508,6 +2508,7 @@ ci.fyi_builder( ...@@ -2508,6 +2508,7 @@ ci.fyi_builder(
goma_backend = None, goma_backend = None,
properties = { properties = {
"builder_to_warm": "linux-warmed", "builder_to_warm": "linux-warmed",
"trigger_count": 2,
}, },
schedule = "with 2m interval", schedule = "with 2m interval",
service_account = "chromium-led-tot-warmer@chops-service-accounts.iam.gserviceaccount.com", service_account = "chromium-led-tot-warmer@chops-service-accounts.iam.gserviceaccount.com",
......
...@@ -1058,10 +1058,24 @@ try_.chromium_linux_builder( ...@@ -1058,10 +1058,24 @@ try_.chromium_linux_builder(
name = "linux-warmed", name = "linux-warmed",
builderless = False, builderless = False,
goma_jobs = goma.jobs.J150, goma_jobs = goma.jobs.J150,
tryjob = try_.job(experiment_percentage = 5),
use_clang_coverage = True, use_clang_coverage = True,
) )
# crbug.com/1149606: Experimental builder to test pre-warming
try_.chromium_linux_builder(
name = "linux-warmed-orchestrator",
executable = "recipe:chromium/mini_orchestrator",
goma_backend = None,
properties = {
"builder_to_trigger": {
"builder_group": "tryserver.chromium.linux",
"buildername": "linux-warmed",
},
},
service_account = "chromium-mini-orchestrator@chops-service-accounts.iam.gserviceaccount.com",
tryjob = try_.job(experiment_percentage = 5),
)
try_.chromium_linux_builder( try_.chromium_linux_builder(
name = "linux-webkit-msan-rel", name = "linux-webkit-msan-rel",
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment