Skip to content

GitLab

T
tangled
Commit 9f567ad6 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Add branched CI builders for the phase B Android try builders. 

Expected capacity requirements:
* luci.chromium.ci
  * 0.66 x (builderless:1, cores:8, cpu:x86-64, os:Ubuntu-16.04, ssd:0)
* chromium.tests
  * 1.44 x (device_os:KTU84P, os:Android, device_type:Nexus 5 (hammerhead))
  * 20.32 x (device_os:MMB29Q, os:Android, device_type:Nexus 5x (bullhead))

Capacity requirements are supported by the current headroom.

Bug: 1024641
Change-Id: I5ba96d029af33581cf38124feac22a88e5a1c09f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1929265Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720571}
parent f636d94d
Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 33 deletions
infra/config/buckets/ci.star
View file @ 9f567ad6
...@@ -315,14 +315,6 @@ android_builder( ...@@ -315,14 +315,6 @@ android_builder(
name = 'android-incremental-dbg', name = 'android-incremental-dbg',
) )
android_builder(
name = 'android-kitkat-arm-rel',
)
android_builder(
name = 'android-marshmallow-arm64-rel',
)
android_builder( android_builder(
name = 'android-pie-arm64-dbg', name = 'android-pie-arm64-dbg',
) )
...@@ -1811,11 +1803,6 @@ def gpu_builder(*, name, **kwargs): ...@@ -1811,11 +1803,6 @@ def gpu_builder(*, name, **kwargs):
**kwargs **kwargs
) )
gpu_builder(
name = 'Android Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_builder( gpu_builder(
name = 'GPU Linux Builder (dbg)', name = 'GPU Linux Builder (dbg)',
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
......
infra/config/consoles/main-beta.star
View file @ 9f567ad6
...@@ -21,13 +21,27 @@ luci.console_view( ...@@ -21,13 +21,27 @@ luci.console_view(
# TODO(https://crbug.com/922150) Move these to an appropriate console # TODO(https://crbug.com/922150) Move these to an appropriate console
# and/or don't have linux-rel mirror these since they do not appear on # and/or don't have linux-rel mirror these since they do not appear on
# the main console # the main console
luci.console_view_entry(
builder = 'ci-beta/android-kitkat-arm-rel',
category = 'chromium.android',
short_name = 'k',
),
luci.console_view_entry(
builder = 'ci-beta/android-marshmallow-arm64-rel',
category = 'chromium.android',
short_name = 'm',
),
luci.console_view_entry(
builder = 'ci-beta/Android Release (Nexus 5X)',
category = 'chromium.gpu|android',
),
luci.console_view_entry( luci.console_view_entry(
builder = 'ci-beta/GPU Linux Builder', builder = 'ci-beta/GPU Linux Builder',
category = 'chromium.gpu', category = 'chromium.gpu|linux',
), ),
luci.console_view_entry( luci.console_view_entry(
builder = 'ci-beta/Linux Release (NVIDIA)', builder = 'ci-beta/Linux Release (NVIDIA)',
category = 'chromium.gpu', category = 'chromium.gpu|linux',
), ),
], ],
) )
infra/config/consoles/main-stable.star
View file @ 9f567ad6
...@@ -18,13 +18,30 @@ luci.console_view( ...@@ -18,13 +18,30 @@ luci.console_view(
category = 'chromium.linux|release', category = 'chromium.linux|release',
short_name = 'tst', short_name = 'tst',
), ),
# TODO(https://crbug.com/922150) Move these to an appropriate console
# and/or don't have linux-rel mirror these since they do not appear on
# the main console
luci.console_view_entry(
builder = 'ci-stable/android-kitkat-arm-rel',
category = 'chromium.android',
short_name = 'k',
),
luci.console_view_entry(
builder = 'ci-stable/android-marshmallow-arm64-rel',
category = 'chromium.android',
short_name = 'm',
),
luci.console_view_entry(
builder = 'ci-stable/Android Release (Nexus 5X)',
category = 'chromium.gpu|android',
),
luci.console_view_entry( luci.console_view_entry(
builder = 'ci-stable/GPU Linux Builder', builder = 'ci-stable/GPU Linux Builder',
category = 'chromium.gpu', category = 'chromium.gpu|linux',
), ),
luci.console_view_entry( luci.console_view_entry(
builder = 'ci-stable/Linux Release (NVIDIA)', builder = 'ci-stable/Linux Release (NVIDIA)',
category = 'chromium.gpu', category = 'chromium.gpu|linux',
), ),
], ],
) )
infra/config/generated/cr-buildbucket.cfg
View file @ 9f567ad6
...@@ -535,6 +535,7 @@ buckets: < ...@@ -535,6 +535,7 @@ buckets: <
name: "chromium" name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.gpu\"" properties_j: "mastername:\"chromium.gpu\""
...@@ -6077,6 +6078,7 @@ buckets: < ...@@ -6077,6 +6078,7 @@ buckets: <
name: "chromium" name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\"" properties_j: "mastername:\"chromium.android\""
...@@ -6098,6 +6100,7 @@ buckets: < ...@@ -6098,6 +6100,7 @@ buckets: <
name: "chromium" name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\"" properties_j: "mastername:\"chromium.android\""
...@@ -7927,6 +7930,29 @@ buckets: < ...@@ -7927,6 +7930,29 @@ buckets: <
group: "project-chromium-ci-schedulers" group: "project-chromium-ci-schedulers"
> >
swarming: < swarming: <
builders: <
name: "Android Release (Nexus 5X)"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.gpu\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: < builders: <
name: "GPU Linux Builder" name: "GPU Linux Builder"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
...@@ -8018,6 +8044,52 @@ buckets: < ...@@ -8018,6 +8044,52 @@ buckets: <
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
> >
builders: <
name: "android-kitkat-arm-rel"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: <
name: "android-marshmallow-arm64-rel"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
> >
> >
buckets: < buckets: <
...@@ -8034,6 +8106,29 @@ buckets: < ...@@ -8034,6 +8106,29 @@ buckets: <
group: "project-chromium-ci-schedulers" group: "project-chromium-ci-schedulers"
> >
swarming: < swarming: <
builders: <
name: "Android Release (Nexus 5X)"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.gpu\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: < builders: <
name: "GPU Linux Builder" name: "GPU Linux Builder"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
...@@ -8125,6 +8220,52 @@ buckets: < ...@@ -8125,6 +8220,52 @@ buckets: <
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
> >
builders: <
name: "android-kitkat-arm-rel"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: <
name: "android-marshmallow-arm64-rel"
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.ci"
dimensions: "ssd:0"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
properties_j: "$build/goma:{\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.android\""
>
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
> >
> >
buckets: < buckets: <
......
infra/config/generated/luci-milo.cfg
View file @ 9f567ad6
...@@ -10759,13 +10759,27 @@ consoles: < ...@@ -10759,13 +10759,27 @@ consoles: <
category: "chromium.linux|release" category: "chromium.linux|release"
short_name: "tst" short_name: "tst"
> >
builders: <
name: "buildbucket/luci.chromium.ci-beta/android-kitkat-arm-rel"
category: "chromium.android"
short_name: "k"
>
builders: <
name: "buildbucket/luci.chromium.ci-beta/android-marshmallow-arm64-rel"
category: "chromium.android"
short_name: "m"
>
builders: <
name: "buildbucket/luci.chromium.ci-beta/Android Release (Nexus 5X)"
category: "chromium.gpu|android"
>
builders: < builders: <
name: "buildbucket/luci.chromium.ci-beta/GPU Linux Builder" name: "buildbucket/luci.chromium.ci-beta/GPU Linux Builder"
category: "chromium.gpu" category: "chromium.gpu|linux"
> >
builders: < builders: <
name: "buildbucket/luci.chromium.ci-beta/Linux Release (NVIDIA)" name: "buildbucket/luci.chromium.ci-beta/Linux Release (NVIDIA)"
category: "chromium.gpu" category: "chromium.gpu|linux"
> >
header: < header: <
oncalls: < oncalls: <
...@@ -11031,13 +11045,27 @@ consoles: < ...@@ -11031,13 +11045,27 @@ consoles: <
category: "chromium.linux|release" category: "chromium.linux|release"
short_name: "tst" short_name: "tst"
> >
builders: <
name: "buildbucket/luci.chromium.ci-stable/android-kitkat-arm-rel"
category: "chromium.android"
short_name: "k"
>
builders: <
name: "buildbucket/luci.chromium.ci-stable/android-marshmallow-arm64-rel"
category: "chromium.android"
short_name: "m"
>
builders: <
name: "buildbucket/luci.chromium.ci-stable/Android Release (Nexus 5X)"
category: "chromium.gpu|android"
>
builders: < builders: <
name: "buildbucket/luci.chromium.ci-stable/GPU Linux Builder" name: "buildbucket/luci.chromium.ci-stable/GPU Linux Builder"
category: "chromium.gpu" category: "chromium.gpu|linux"
> >
builders: < builders: <
name: "buildbucket/luci.chromium.ci-stable/Linux Release (NVIDIA)" name: "buildbucket/luci.chromium.ci-stable/Linux Release (NVIDIA)"
category: "chromium.gpu" category: "chromium.gpu|linux"
> >
header: < header: <
oncalls: < oncalls: <
......
infra/config/generated/luci-scheduler.cfg
View file @ 9f567ad6
...@@ -93,7 +93,6 @@ trigger { ...@@ -93,7 +93,6 @@ trigger {
triggers: "Android FYI SkiaRenderer GL (Nexus 5X)" triggers: "Android FYI SkiaRenderer GL (Nexus 5X)"
triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)" triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
triggers: "Android FYI dEQP Release (Nexus 5X)" triggers: "Android FYI dEQP Release (Nexus 5X)"
triggers: "Android Release (Nexus 5X)"
triggers: "Android arm Builder (dbg)" triggers: "Android arm Builder (dbg)"
triggers: "Android arm64 Builder (dbg)" triggers: "Android arm64 Builder (dbg)"
triggers: "Android x64 Builder (dbg)" triggers: "Android x64 Builder (dbg)"
...@@ -324,8 +323,6 @@ trigger { ...@@ -324,8 +323,6 @@ trigger {
triggers: "android-cronet-x86-rel" triggers: "android-cronet-x86-rel"
triggers: "android-archive-dbg" triggers: "android-archive-dbg"
triggers: "android-incremental-dbg" triggers: "android-incremental-dbg"
triggers: "android-kitkat-arm-rel"
triggers: "android-marshmallow-arm64-rel"
triggers: "android-mojo-webview-rel" triggers: "android-mojo-webview-rel"
triggers: "android-pie-arm64-rel" triggers: "android-pie-arm64-rel"
triggers: "android-archive-rel" triggers: "android-archive-rel"
...@@ -416,8 +413,11 @@ trigger { ...@@ -416,8 +413,11 @@ trigger {
# These triggers have the bucket name munged in because there are multiple # These triggers have the bucket name munged in because there are multiple
# builders with the same name in different buckets # builders with the same name in different buckets
triggers: "ci-Android Release (Nexus 5X)"
triggers: "ci-GPU Linux Builder" triggers: "ci-GPU Linux Builder"
triggers: "ci-Linux Builder" triggers: "ci-Linux Builder"
triggers: "ci-android-kitkat-arm-rel"
triggers: "ci-android-marshmallow-arm64-rel"
} }
# These bots tests running Chromium tests with WebRTC HEAD, so they should # These bots tests running Chromium tests with WebRTC HEAD, so they should
...@@ -460,8 +460,11 @@ trigger { ...@@ -460,8 +460,11 @@ trigger {
refs: "refs/branch-heads/3945" refs: "refs/branch-heads/3945"
} }
triggers: "ci-beta-Android Release (Nexus 5X)"
triggers: "ci-beta-GPU Linux Builder" triggers: "ci-beta-GPU Linux Builder"
triggers: "ci-beta-Linux Builder" triggers: "ci-beta-Linux Builder"
triggers: "ci-beta-android-kitkat-arm-rel"
triggers: "ci-beta-android-marshmallow-arm64-rel"
} }
################################################################################ ################################################################################
...@@ -476,8 +479,12 @@ trigger { ...@@ -476,8 +479,12 @@ trigger {
refs: "refs/branch-heads/3904" refs: "refs/branch-heads/3904"
} }
triggers: "ci-stable-Android Release (Nexus 5X)"
triggers: "ci-stable-GPU Linux Builder" triggers: "ci-stable-GPU Linux Builder"
triggers: "ci-stable-Linux Builder" triggers: "ci-stable-Linux Builder"
triggers: "ci-stable-android-kitkat-arm-rel"
triggers: "ci-stable-android-marshmallow-arm64-rel"
} }
################################################################################ ################################################################################
...@@ -674,7 +681,7 @@ job { ...@@ -674,7 +681,7 @@ job {
} }
job { job {
id: "Android Release (Nexus 5X)" id: "ci-Android Release (Nexus 5X)"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -944,7 +951,7 @@ job { ...@@ -944,7 +951,7 @@ job {
} }
job { job {
id: "android-kitkat-arm-rel" id: "ci-android-kitkat-arm-rel"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -954,7 +961,7 @@ job { ...@@ -954,7 +961,7 @@ job {
} }
job { job {
id: "android-marshmallow-arm64-rel" id: "ci-android-marshmallow-arm64-rel"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -1508,6 +1515,16 @@ job { ...@@ -1508,6 +1515,16 @@ job {
} }
} }
job {
id: "ci-beta-Android Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "Android Release (Nexus 5X)"
}
}
job { job {
id: "ci-beta-GPU Linux Builder" id: "ci-beta-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1550,6 +1567,26 @@ job { ...@@ -1550,6 +1567,26 @@ job {
} }
} }
job {
id: "ci-beta-android-kitkat-arm-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "android-kitkat-arm-rel"
}
}
job {
id: "ci-beta-android-marshmallow-arm64-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "android-marshmallow-arm64-rel"
}
}
job { job {
id: "ci-GPU Linux Builder" id: "ci-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1592,6 +1629,16 @@ job { ...@@ -1592,6 +1629,16 @@ job {
} }
} }
job {
id: "ci-stable-Android Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "Android Release (Nexus 5X)"
}
}
job { job {
id: "ci-stable-GPU Linux Builder" id: "ci-stable-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1634,6 +1681,26 @@ job { ...@@ -1634,6 +1681,26 @@ job {
} }
} }
job {
id: "ci-stable-android-kitkat-arm-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "android-kitkat-arm-rel"
}
}
job {
id: "ci-stable-android-marshmallow-arm64-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "android-marshmallow-arm64-rel"
}
}
job { job {
id: "Dawn Linux x64 Builder" id: "Dawn Linux x64 Builder"
acl_sets: "default" acl_sets: "default"
......
infra/config/luci-scheduler.cfg
View file @ 9f567ad6
...@@ -93,7 +93,6 @@ trigger { ...@@ -93,7 +93,6 @@ trigger {
triggers: "Android FYI SkiaRenderer GL (Nexus 5X)" triggers: "Android FYI SkiaRenderer GL (Nexus 5X)"
triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)" triggers: "Android FYI SkiaRenderer Vulkan (Pixel 2)"
triggers: "Android FYI dEQP Release (Nexus 5X)" triggers: "Android FYI dEQP Release (Nexus 5X)"
triggers: "Android Release (Nexus 5X)"
triggers: "Android arm Builder (dbg)" triggers: "Android arm Builder (dbg)"
triggers: "Android arm64 Builder (dbg)" triggers: "Android arm64 Builder (dbg)"
triggers: "Android x64 Builder (dbg)" triggers: "Android x64 Builder (dbg)"
...@@ -324,8 +323,6 @@ trigger { ...@@ -324,8 +323,6 @@ trigger {
triggers: "android-cronet-x86-rel" triggers: "android-cronet-x86-rel"
triggers: "android-archive-dbg" triggers: "android-archive-dbg"
triggers: "android-incremental-dbg" triggers: "android-incremental-dbg"
triggers: "android-kitkat-arm-rel"
triggers: "android-marshmallow-arm64-rel"
triggers: "android-mojo-webview-rel" triggers: "android-mojo-webview-rel"
triggers: "android-pie-arm64-rel" triggers: "android-pie-arm64-rel"
triggers: "android-archive-rel" triggers: "android-archive-rel"
...@@ -416,8 +413,11 @@ trigger { ...@@ -416,8 +413,11 @@ trigger {
# These triggers have the bucket name munged in because there are multiple # These triggers have the bucket name munged in because there are multiple
# builders with the same name in different buckets # builders with the same name in different buckets
triggers: "ci-Android Release (Nexus 5X)"
triggers: "ci-GPU Linux Builder" triggers: "ci-GPU Linux Builder"
triggers: "ci-Linux Builder" triggers: "ci-Linux Builder"
triggers: "ci-android-kitkat-arm-rel"
triggers: "ci-android-marshmallow-arm64-rel"
} }
# These bots tests running Chromium tests with WebRTC HEAD, so they should # These bots tests running Chromium tests with WebRTC HEAD, so they should
...@@ -460,8 +460,11 @@ trigger { ...@@ -460,8 +460,11 @@ trigger {
refs: "refs/branch-heads/3945" refs: "refs/branch-heads/3945"
} }
triggers: "ci-beta-Android Release (Nexus 5X)"
triggers: "ci-beta-GPU Linux Builder" triggers: "ci-beta-GPU Linux Builder"
triggers: "ci-beta-Linux Builder" triggers: "ci-beta-Linux Builder"
triggers: "ci-beta-android-kitkat-arm-rel"
triggers: "ci-beta-android-marshmallow-arm64-rel"
} }
################################################################################ ################################################################################
...@@ -476,8 +479,12 @@ trigger { ...@@ -476,8 +479,12 @@ trigger {
refs: "refs/branch-heads/3904" refs: "refs/branch-heads/3904"
} }
triggers: "ci-stable-Android Release (Nexus 5X)"
triggers: "ci-stable-GPU Linux Builder" triggers: "ci-stable-GPU Linux Builder"
triggers: "ci-stable-Linux Builder" triggers: "ci-stable-Linux Builder"
triggers: "ci-stable-android-kitkat-arm-rel"
triggers: "ci-stable-android-marshmallow-arm64-rel"
} }
################################################################################ ################################################################################
...@@ -674,7 +681,7 @@ job { ...@@ -674,7 +681,7 @@ job {
} }
job { job {
id: "Android Release (Nexus 5X)" id: "ci-Android Release (Nexus 5X)"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -944,7 +951,7 @@ job { ...@@ -944,7 +951,7 @@ job {
} }
job { job {
id: "android-kitkat-arm-rel" id: "ci-android-kitkat-arm-rel"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -954,7 +961,7 @@ job { ...@@ -954,7 +961,7 @@ job {
} }
job { job {
id: "android-marshmallow-arm64-rel" id: "ci-android-marshmallow-arm64-rel"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
...@@ -1508,6 +1515,16 @@ job { ...@@ -1508,6 +1515,16 @@ job {
} }
} }
job {
id: "ci-beta-Android Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "Android Release (Nexus 5X)"
}
}
job { job {
id: "ci-beta-GPU Linux Builder" id: "ci-beta-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1550,6 +1567,26 @@ job { ...@@ -1550,6 +1567,26 @@ job {
} }
} }
job {
id: "ci-beta-android-kitkat-arm-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "android-kitkat-arm-rel"
}
}
job {
id: "ci-beta-android-marshmallow-arm64-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-beta"
builder: "android-marshmallow-arm64-rel"
}
}
job { job {
id: "ci-GPU Linux Builder" id: "ci-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1592,6 +1629,16 @@ job { ...@@ -1592,6 +1629,16 @@ job {
} }
} }
job {
id: "ci-stable-Android Release (Nexus 5X)"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "Android Release (Nexus 5X)"
}
}
job { job {
id: "ci-stable-GPU Linux Builder" id: "ci-stable-GPU Linux Builder"
acl_sets: "default" acl_sets: "default"
...@@ -1634,6 +1681,26 @@ job { ...@@ -1634,6 +1681,26 @@ job {
} }
} }
job {
id: "ci-stable-android-kitkat-arm-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "android-kitkat-arm-rel"
}
}
job {
id: "ci-stable-android-marshmallow-arm64-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-stable"
builder: "android-marshmallow-arm64-rel"
}
}
job { job {
id: "Dawn Linux x64 Builder" id: "Dawn Linux x64 Builder"
acl_sets: "default" acl_sets: "default"
......
infra/config/versioned/milestones/m78/buckets/ci.star
View file @ 9f567ad6
...@@ -34,6 +34,32 @@ defaults.bucketed_triggers.set(True) ...@@ -34,6 +34,32 @@ defaults.bucketed_triggers.set(True)
# libfuzzer recipe): XXX_builder and XXX_YYY_builder where XXX is the part after # libfuzzer recipe): XXX_builder and XXX_YYY_builder where XXX is the part after
# the last dot in the mastername and YYY is the OS or configuration # the last dot in the mastername and YYY is the OS or configuration
def android_builder(
*,
name,
# TODO(tandrii): migrate to this gradually (current value of
# goma.jobs.MANY_JOBS_FOR_CI is 500).
# goma_jobs=goma.jobs.MANY_JOBS_FOR_CI
goma_jobs=goma.jobs.J150,
**kwargs):
return builder(
name = name,
goma_jobs = goma_jobs,
mastername = 'chromium.android',
**kwargs
)
android_builder(
name = 'android-kitkat-arm-rel',
goma_backend = goma.backend.RBE_PROD,
)
android_builder(
name = 'android-marshmallow-arm64-rel',
goma_backend = goma.backend.RBE_PROD,
)
def gpu_builder(*, name, **kwargs): def gpu_builder(*, name, **kwargs):
return builder( return builder(
name = name, name = name,
...@@ -41,6 +67,11 @@ def gpu_builder(*, name, **kwargs): ...@@ -41,6 +67,11 @@ def gpu_builder(*, name, **kwargs):
**kwargs **kwargs
) )
gpu_builder(
name = 'Android Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_builder( gpu_builder(
name = 'GPU Linux Builder', name = 'GPU Linux Builder',
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
......
infra/config/versioned/milestones/m79/buckets/ci.star
View file @ 9f567ad6
...@@ -34,6 +34,32 @@ defaults.bucketed_triggers.set(True) ...@@ -34,6 +34,32 @@ defaults.bucketed_triggers.set(True)
# libfuzzer recipe): XXX_builder and XXX_YYY_builder where XXX is the part after # libfuzzer recipe): XXX_builder and XXX_YYY_builder where XXX is the part after
# the last dot in the mastername and YYY is the OS or configuration # the last dot in the mastername and YYY is the OS or configuration
def android_builder(
*,
name,
# TODO(tandrii): migrate to this gradually (current value of
# goma.jobs.MANY_JOBS_FOR_CI is 500).
# goma_jobs=goma.jobs.MANY_JOBS_FOR_CI
goma_jobs=goma.jobs.J150,
**kwargs):
return builder(
name = name,
goma_jobs = goma_jobs,
mastername = 'chromium.android',
**kwargs
)
android_builder(
name = 'android-kitkat-arm-rel',
goma_backend = goma.backend.RBE_PROD,
)
android_builder(
name = 'android-marshmallow-arm64-rel',
goma_backend = goma.backend.RBE_PROD,
)
def gpu_builder(*, name, **kwargs): def gpu_builder(*, name, **kwargs):
return builder( return builder(
name = name, name = name,
...@@ -41,6 +67,11 @@ def gpu_builder(*, name, **kwargs): ...@@ -41,6 +67,11 @@ def gpu_builder(*, name, **kwargs):
**kwargs **kwargs
) )
gpu_builder(
name = 'Android Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_builder( gpu_builder(
name = 'GPU Linux Builder', name = 'GPU Linux Builder',
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
......
infra/config/versioned/trunk/buckets/ci.star
View file @ 9f567ad6
...@@ -24,6 +24,32 @@ defaults.bucket.set(vars.bucket.get()) ...@@ -24,6 +24,32 @@ defaults.bucket.set(vars.bucket.get())
defaults.bucketed_triggers.set(True) defaults.bucketed_triggers.set(True)
def android_builder(
*,
name,
# TODO(tandrii): migrate to this gradually (current value of
# goma.jobs.MANY_JOBS_FOR_CI is 500).
# goma_jobs=goma.jobs.MANY_JOBS_FOR_CI
goma_jobs=goma.jobs.J150,
**kwargs):
return builder(
name = name,
goma_jobs = goma_jobs,
mastername = 'chromium.android',
**kwargs
)
android_builder(
name = 'android-kitkat-arm-rel',
goma_backend = goma.backend.RBE_PROD,
)
android_builder(
name = 'android-marshmallow-arm64-rel',
goma_backend = goma.backend.RBE_PROD,
)
def gpu_builder(*, name, **kwargs): def gpu_builder(*, name, **kwargs):
return builder( return builder(
name = name, name = name,
...@@ -31,6 +57,11 @@ def gpu_builder(*, name, **kwargs): ...@@ -31,6 +57,11 @@ def gpu_builder(*, name, **kwargs):
**kwargs **kwargs
) )
gpu_builder(
name = 'Android Release (Nexus 5X)',
goma_backend = goma.backend.RBE_PROD,
)
gpu_builder( gpu_builder(
name = 'GPU Linux Builder', name = 'GPU Linux Builder',
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
......
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