diff options
Diffstat (limited to 'chromium/third_party/openscreen/src/infra')
4 files changed, 95 insertions, 10 deletions
diff --git a/chromium/third_party/openscreen/src/infra/config/global/commit-queue.cfg b/chromium/third_party/openscreen/src/infra/config/global/commit-queue.cfg index d51fcc00bee..22a5b11392b 100644 --- a/chromium/third_party/openscreen/src/infra/config/global/commit-queue.cfg +++ b/chromium/third_party/openscreen/src/infra/config/global/commit-queue.cfg @@ -9,6 +9,7 @@ submit_options { } } config_groups { + name: "openscreen-build-config" gerrit { url: "https://chromium-review.googlesource.com" projects { @@ -22,6 +23,8 @@ config_groups { dry_run_access_list: "project-openscreen-tryjob-access" } tryjob { + # Bots declared "experiment_percentage: 100" are FYI Bots that always + # run but are not considered part of the commit queue pass/fail. builders { name: "openscreen/try/linux64_debug" } @@ -40,14 +43,16 @@ config_groups { builders { name: "openscreen/try/openscreen_presubmit" } - builders { name: "openscreen/try/chromium_linux64_debug" } builders { name: "openscreen/try/chromium_mac_debug" } - + builders { + name: "openscreen/try/linux64_coverage_debug" + experiment_percentage: 100 + } retry_config { single_quota: 1 global_quota: 2 diff --git a/chromium/third_party/openscreen/src/infra/config/global/cr-buildbucket.cfg b/chromium/third_party/openscreen/src/infra/config/global/cr-buildbucket.cfg index 31ef94b509a..4bab09a0aac 100644 --- a/chromium/third_party/openscreen/src/infra/config/global/cr-buildbucket.cfg +++ b/chromium/third_party/openscreen/src/infra/config/global/cr-buildbucket.cfg @@ -34,6 +34,13 @@ acl_sets { } builder_mixins { + name: "ci" + recipe { + properties_j: "is_ci:true" + } +} + +builder_mixins { name: "debug" recipe { properties_j: "is_debug:true" @@ -137,6 +144,31 @@ builder_mixins { } } +builder_mixins { + name: "goma_rbe" + recipe: { + properties_j: <<EOF + $build/goma: { + "server_host": "goma.chromium.org", + "rpc_extra_params": "?prod" + } + EOF + } +} + +builder_mixins { + name: "goma_rbe_ats" + recipe: { + properties_j: <<EOF + $build/goma: { + "server_host": "goma.chromium.org", + "rpc_extra_params": "?prod", + "enable_ats": true + } + EOF + } +} + buckets { name: "luci.openscreen.ci" acl_sets: "ci" @@ -148,6 +180,22 @@ buckets { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/master" name: "openscreen" + # Note: we use bash-style heredocs to avoid having to escape everything. + properties_j: <<EOF + $depot_tools/bot_update: { + "apply_patch_on_gclient":true + } + EOF + properties_j: <<EOF + $recipe_engine/isolated: { + "server": "https://isolateserver.appspot.com" + } + EOF + properties_j: <<EOF + $recipe_engine/swarming: { + "server": "https://chromium-swarm.appspot.com" + } + EOF } service_account: "openscreen-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } @@ -158,6 +206,8 @@ buckets { mixins: "debug" mixins: "x64" mixins: "asan" + mixins: "ci" + mixins: "goma_rbe_ats" } builders { @@ -166,6 +216,7 @@ buckets { mixins: "debug" mixins: "x64" mixins: "gcc" + mixins: "ci" } builders { @@ -173,6 +224,8 @@ buckets { mixins: "linux" mixins: "x64" mixins: "tsan" + mixins: "ci" + mixins: "goma_rbe_ats" } builders { @@ -181,6 +234,8 @@ buckets { mixins: "arm64" mixins: "debug" mixins: "sysroot_platform_stretch" + mixins: "ci" + mixins: "goma_rbe_ats" } builders { @@ -188,6 +243,8 @@ buckets { mixins: "mac" mixins: "debug" mixins: "x64" + mixins: "ci" + mixins: "goma_rbe" } builders { @@ -196,6 +253,8 @@ buckets { mixins: "debug" mixins: "x64" mixins: "chromium" + mixins: "ci" + mixins: "goma_rbe_ats" } builders { @@ -204,6 +263,8 @@ buckets { mixins: "debug" mixins: "x64" mixins: "chromium" + mixins: "ci" + mixins: "goma_rbe" } # TODO(issuetracker.google.com/155812080): Integrate this with existing @@ -214,6 +275,8 @@ buckets { mixins: "debug" mixins: "x64" mixins: "code_coverage" + mixins: "ci" + mixins: "goma_rbe_ats" } } } @@ -231,17 +294,17 @@ buckets: { name: "openscreen" # Note: we use bash-style heredocs to avoid having to escape everything. properties_j: <<EOF - $depot_tools/bot_update:{ + $depot_tools/bot_update: { "apply_patch_on_gclient":true } EOF properties_j: <<EOF - $recipe_engine/isolated:{ + $recipe_engine/isolated: { "server": "https://isolateserver.appspot.com" } EOF properties_j: <<EOF - $recipe_engine/swarming:{ + $recipe_engine/swarming: { "server": "https://chromium-swarm.appspot.com" } EOF @@ -255,6 +318,7 @@ buckets: { mixins: "debug" mixins: "x64" mixins: "asan" + mixins: "goma_rbe_ats" } builders { @@ -270,6 +334,7 @@ buckets: { mixins: "linux" mixins: "x64" mixins: "tsan" + mixins: "goma_rbe_ats" } builders { @@ -278,6 +343,7 @@ buckets: { mixins: "arm64" mixins: "debug" mixins: "sysroot_platform_stretch" + mixins: "goma_rbe_ats" } builders { @@ -285,6 +351,7 @@ buckets: { mixins: "mac" mixins: "debug" mixins: "x64" + mixins: "goma_rbe" } builders { @@ -304,6 +371,7 @@ buckets: { mixins: "debug" mixins: "x64" mixins: "chromium" + mixins: "goma_rbe_ats" } builders { @@ -312,6 +380,18 @@ buckets: { mixins: "debug" mixins: "x64" mixins: "chromium" + mixins: "goma_rbe" + } + + # TODO(issuetracker.google.com/155812080): Integrate this with existing + # linux64_debug bot. + builders { + name: "linux64_coverage_debug" + mixins: "linux" + mixins: "debug" + mixins: "x64" + mixins: "code_coverage" + mixins: "goma_rbe_ats" } } } diff --git a/chromium/third_party/openscreen/src/infra/config/global/luci-milo.cfg b/chromium/third_party/openscreen/src/infra/config/global/luci-milo.cfg index 974670a59f2..70df9ce0b79 100644 --- a/chromium/third_party/openscreen/src/infra/config/global/luci-milo.cfg +++ b/chromium/third_party/openscreen/src/infra/config/global/luci-milo.cfg @@ -50,7 +50,7 @@ consoles { } builders { - name: "buildbucket/luci.openscreen.ci/code_coverage" + name: "buildbucket/luci.openscreen.ci/linux64_coverage_debug" category: "linux|x64" short_name: "coverage" } @@ -106,7 +106,7 @@ consoles { } builders { - name: "buildbucket/luci.openscreen.try/code_coverage" + name: "buildbucket/luci.openscreen.try/linux64_coverage_debug" category: "linux|x64" short_name: "coverage" } diff --git a/chromium/third_party/openscreen/src/infra/config/global/luci-scheduler.cfg b/chromium/third_party/openscreen/src/infra/config/global/luci-scheduler.cfg index dfe8b6ae1d3..13612af8589 100644 --- a/chromium/third_party/openscreen/src/infra/config/global/luci-scheduler.cfg +++ b/chromium/third_party/openscreen/src/infra/config/global/luci-scheduler.cfg @@ -27,7 +27,7 @@ trigger { triggers: "linux64_tsan" triggers: "linux_arm64_debug" triggers: "mac_debug" - triggers: "code_coverage" + triggers: "linux64_coverage_debug" } trigger { @@ -113,11 +113,11 @@ job { } job { - id: "code_coverage" + id: "linux64_coverage_debug" acl_sets: "default" buildbucket: { server: "cr-buildbucket.appspot.com" bucket: "luci.openscreen.ci" - builder: "code_coverage" + builder: "linux64_coverage_debug" } } |