Commit b5e305cf authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot

luci: Remove the builder android-kitkat-arm-rel from m83.

K is deprecated after m81 so it is not needed any more.
android-cronet-kitkat-arm-rel is kept due to https://crbug.com/1032336#c25

Bug: 1032336
Change-Id: I4e93516375f79faf2b21ef5d7a9c5073b8df9908
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2157974Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#761002}
parent 4d33e2a1
...@@ -1363,9 +1363,6 @@ config_groups: < ...@@ -1363,9 +1363,6 @@ config_groups: <
location_regexp: ".+/[+]/build/config/android/.+" location_regexp: ".+/[+]/build/config/android/.+"
location_regexp_exclude: ".+/[+]/components/cronet/ios/.+" location_regexp_exclude: ".+/[+]/components/cronet/ios/.+"
> >
builders: <
name: "chromium/try-m83/android-kitkat-arm-rel"
>
builders: < builders: <
name: "chromium/try-m83/android-marshmallow-arm64-rel" name: "chromium/try-m83/android-marshmallow-arm64-rel"
> >
......
...@@ -12534,32 +12534,6 @@ buckets: < ...@@ -12534,32 +12534,6 @@ buckets: <
enable: true enable: true
> >
> >
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:{\"enable_ats\":true,\"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"
resultdb: <
enable: true
>
>
builders: < builders: <
name: "android-marshmallow-arm64-rel" name: "android-marshmallow-arm64-rel"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
...@@ -24202,39 +24176,6 @@ buckets: < ...@@ -24202,39 +24176,6 @@ buckets: <
enable: true enable: true
> >
> >
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.try"
dimensions: "ssd:0"
recipe: <
name: "chromium_trybot"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"tryserver.chromium.android\""
>
execution_timeout_secs: 14400
expiration_secs: 7200
caches: <
name: "win_toolchain"
path: "win_toolchain"
>
build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage: <
value: 5
>
resultdb: <
enable: true
>
>
builders: < builders: <
name: "android-marshmallow-arm64-rel" name: "android-marshmallow-arm64-rel"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
......
...@@ -11933,11 +11933,6 @@ consoles: < ...@@ -11933,11 +11933,6 @@ consoles: <
category: "chromium.android|tester|webview" category: "chromium.android|tester|webview"
short_name: "P" short_name: "P"
> >
builders: <
name: "buildbucket/luci.chromium.ci-m83/android-kitkat-arm-rel"
category: "chromium.android|on_cq"
short_name: "K"
>
builders: < builders: <
name: "buildbucket/luci.chromium.ci-m83/android-marshmallow-arm64-rel" name: "buildbucket/luci.chromium.ci-m83/android-marshmallow-arm64-rel"
category: "chromium.android|on_cq" category: "chromium.android|on_cq"
...@@ -12924,9 +12919,6 @@ consoles: < ...@@ -12924,9 +12919,6 @@ consoles: <
builders: < builders: <
name: "buildbucket/luci.chromium.try-m83/android-cronet-arm-dbg" name: "buildbucket/luci.chromium.try-m83/android-cronet-arm-dbg"
> >
builders: <
name: "buildbucket/luci.chromium.try-m83/android-kitkat-arm-rel"
>
builders: < builders: <
name: "buildbucket/luci.chromium.try-m83/android-marshmallow-arm64-rel" name: "buildbucket/luci.chromium.try-m83/android-marshmallow-arm64-rel"
> >
......
...@@ -9429,15 +9429,6 @@ job: < ...@@ -9429,15 +9429,6 @@ job: <
builder: "android-cronet-lollipop-arm-rel" builder: "android-cronet-lollipop-arm-rel"
> >
> >
job: <
id: "ci-m83-android-kitkat-arm-rel"
acl_sets: "ci-m83"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-m83"
builder: "android-kitkat-arm-rel"
>
>
job: < job: <
id: "ci-m83-android-marshmallow-arm64-rel" id: "ci-m83-android-marshmallow-arm64-rel"
acl_sets: "ci-m83" acl_sets: "ci-m83"
...@@ -10887,7 +10878,6 @@ trigger: < ...@@ -10887,7 +10878,6 @@ trigger: <
triggers: "ci-m83-Win x64 Builder" triggers: "ci-m83-Win x64 Builder"
triggers: "ci-m83-android-cronet-arm-dbg" triggers: "ci-m83-android-cronet-arm-dbg"
triggers: "ci-m83-android-cronet-arm-rel" triggers: "ci-m83-android-cronet-arm-rel"
triggers: "ci-m83-android-kitkat-arm-rel"
triggers: "ci-m83-android-marshmallow-arm64-rel" triggers: "ci-m83-android-marshmallow-arm64-rel"
triggers: "ci-m83-android-pie-arm64-rel" triggers: "ci-m83-android-pie-arm64-rel"
triggers: "ci-m83-chromeos-amd64-generic-dbg" triggers: "ci-m83-chromeos-amd64-generic-dbg"
......
...@@ -214,14 +214,6 @@ ci.android_builder( ...@@ -214,14 +214,6 @@ ci.android_builder(
triggered_by = [builder_name('android-cronet-arm-rel')], triggered_by = [builder_name('android-cronet-arm-rel')],
) )
ci.android_builder(
name = 'android-kitkat-arm-rel',
console_view_entry = ci.console_view_entry(
category = 'on_cq',
short_name = 'K',
),
)
ci.android_builder( ci.android_builder(
name = 'android-marshmallow-arm64-rel', name = 'android-marshmallow-arm64-rel',
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
......
...@@ -106,12 +106,6 @@ try_.chromium_android_builder( ...@@ -106,12 +106,6 @@ try_.chromium_android_builder(
), ),
) )
try_.chromium_android_builder(
name = 'android-kitkat-arm-rel',
goma_jobs = goma.jobs.J150,
tryjob = try_.job(),
)
try_.chromium_android_builder( try_.chromium_android_builder(
name = 'android-marshmallow-arm64-rel', name = 'android-marshmallow-arm64-rel',
cores = 16, cores = 16,
......
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