0

luci+mb+testing: Remove android-kitkat-arm-rel related configs

(Added No-Try to release resources for L CQ)

No-Try: true
Bug: 1032336
Change-Id: I800429e0c1ea29f7a12ad0a2f9707ea1ac162e8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165709
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762493}
This commit is contained in:
Haiyang Pan
2020-04-24 20:43:43 +00:00
committed by Commit Bot
parent a1b9642eff
commit b2c3d97a9a
15 changed files with 5 additions and 5768 deletions

@ -17,8 +17,8 @@ of the configuration. Some examples:
* *android_compile_dbg* is a compile-only [no tests] build of Chromium for
Android, using the *debug* configuration.
* *android-kitkat-arm-rel* builds and runs tests for Chromium for Android,
using the *release* configuration on a kitkat device.
* *android-lollipop-arm-rel* builds and runs tests for Chromium for Android,
using the *release* configuration on a lollipop device.
* *win7-rel* builds and runs tests for Chromium on Windows, using
the release configuration on a Windows 7 device. *ng* stands for next
generation, but this has no meaning as the previous generation was already

@ -120,10 +120,6 @@ config_groups: <
name: "chromium/try/android-deterministic-rel"
includable_only: true
>
builders: <
name: "chromium/try/android-kitkat-arm-rel"
includable_only: true
>
builders: <
name: "chromium/try/android-lollipop-arm-rel"
>

@ -9383,37 +9383,6 @@ buckets: <
>
>
>
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/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
bq_exports: <
project: "luci-resultdb"
dataset: "chromium"
table: "ci_test_results"
test_results: <>
>
>
>
builders: <
name: "android-lollipop-arm-rel"
swarming_host: "chromium-swarm.appspot.com"
@ -18770,45 +18739,6 @@ buckets: <
>
>
>
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
bq_exports: <
project: "luci-resultdb"
dataset: "chromium"
table: "try_test_results"
test_results: <>
>
>
>
builders: <
name: "android-lollipop-arm-rel"
swarming_host: "chromium-swarm.appspot.com"

@ -778,11 +778,6 @@ consoles: <
category: "builder_tester|x86"
short_name: "P"
>
builders: <
name: "buildbucket/luci.chromium.ci/android-kitkat-arm-rel"
category: "depre"
short_name: "K"
>
builders: <
name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
category: "on_cq"
@ -4737,11 +4732,6 @@ consoles: <
category: "week3b|android"
short_name: "inc"
>
builders: <
name: "buildbucket/luci.chromium.ci/android-kitkat-arm-rel"
category: "week3b|android"
short_name: "kkat"
>
builders: <
name: "buildbucket/luci.chromium.ci/android-mojo-webview-rel"
category: "week3b|android"
@ -9869,9 +9859,6 @@ consoles: <
builders: <
name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
>
builders: <
name: "buildbucket/luci.chromium.try/android-kitkat-arm-rel"
>
builders: <
name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
>
@ -13143,9 +13130,6 @@ consoles: <
builders: <
name: "buildbucket/luci.chromium.try/android-deterministic-rel"
>
builders: <
name: "buildbucket/luci.chromium.try/android-kitkat-arm-rel"
>
builders: <
name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
>

@ -4055,10 +4055,10 @@ job: <
>
job: <
id: "android-kitkat-arm-rel"
acl_sets: "ci"
acl_sets: "ci-m81"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
bucket: "luci.chromium.ci-m81"
builder: "android-kitkat-arm-rel"
>
>
@ -7588,15 +7588,6 @@ job: <
builder: "android-incremental-dbg"
>
>
job: <
id: "ci-android-kitkat-arm-rel"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-kitkat-arm-rel"
>
>
job: <
id: "ci-android-lollipop-arm-rel"
acl_sets: "ci"
@ -8608,15 +8599,6 @@ job: <
builder: "android-cronet-lollipop-arm-rel"
>
>
job: <
id: "ci-m81-android-kitkat-arm-rel"
acl_sets: "ci-m81"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci-m81"
builder: "android-kitkat-arm-rel"
>
>
job: <
id: "ci-m81-android-marshmallow-arm64-rel"
acl_sets: "ci-m81"
@ -10871,7 +10853,7 @@ trigger: <
triggers: "ci-m81-Win Builder (dbg)"
triggers: "ci-m81-Win x64 Builder"
triggers: "ci-m81-android-cronet-arm-rel"
triggers: "ci-m81-android-kitkat-arm-rel"
triggers: "android-kitkat-arm-rel"
triggers: "ci-m81-android-marshmallow-arm64-rel"
triggers: "ci-m81-chromeos-amd64-generic-rel"
triggers: "ci-m81-chromeos-arm-generic-rel"
@ -11123,7 +11105,6 @@ trigger: <
triggers: "android-cronet-x86-dbg"
triggers: "android-cronet-x86-rel"
triggers: "android-incremental-dbg"
triggers: "ci-android-kitkat-arm-rel"
triggers: "android-lollipop-arm-rel"
triggers: "ci-android-marshmallow-arm64-rel"
triggers: "android-mojo-webview-rel"

@ -593,15 +593,6 @@ ci.android_builder(
),
)
# TODO(crbug/1032336): Remove this once all try builds are finished
ci.android_builder(
name = 'android-kitkat-arm-rel',
console_view_entry = ci.console_view_entry(
category = 'depre',
short_name = 'K',
),
)
ci.android_builder(
name = 'android-pie-x86-rel',
console_view_entry = ci.console_view_entry(

@ -2,7 +2,6 @@ luci.list_view(
name = 'luci.chromium.try',
entries = [
'try/android-cronet-arm-dbg',
'try/android-kitkat-arm-rel',
'try/android-lollipop-arm-rel',
'try/android-marshmallow-arm64-rel',
'try/android-oreo-arm64-cts-networkservice-dbg',

@ -100,12 +100,6 @@ try_.chromium_android_builder(
execution_timeout = 6 * time.hour,
)
# TODO(crbug/1032336): Remove this once all try builds are finished
try_.chromium_android_builder(
name = 'android-kitkat-arm-rel',
goma_jobs=goma.jobs.J150,
)
try_.chromium_android_builder(
name = 'android-marshmallow-x86-fyi-rel',
)

@ -457,11 +457,6 @@ luci.console_view(
category = 'week3b|android',
short_name = 'inc',
),
luci.console_view_entry(
builder = 'ci/android-kitkat-arm-rel',
category = 'week3b|android',
short_name = 'kkat',
),
luci.console_view_entry(
builder = 'ci/android-mojo-webview-rel',
category = 'week3b|android',

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -33,7 +33,6 @@
'android_webview_unittests': {
'remove_from': [
# On chromium.android, these do not need to run prior to M.
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'KitKat Phone Tester (dbg)',
'KitKat Tablet Tester',
@ -619,7 +618,6 @@
'remove_from': [
'android-asan', # https://crbug.com/964562
'android-code-coverage-native', # https://crbug.com/1018780
'android-kitkat-arm-rel', # https://crbug.com/1060245
'android-lollipop-arm-rel', # https://crbug.com/1060245
],
'modifications': {
@ -842,11 +840,6 @@
'shards': 18,
},
},
'android-kitkat-arm-rel': {
'swarming': {
'shards': 15,
},
},
'android-lollipop-arm-rel': {
'swarming': {
'shards': 15,
@ -1400,11 +1393,6 @@
},
},
},
'remove_from': [
# Don't run on trybots, which don't use proguard.
# https://crbug.com/1029936.
'android-kitkat-arm-rel',
],
},
'monochrome_public_test_ar_apk': {
'modifications': {
@ -1667,7 +1655,6 @@
'remove_from': [
'android-asan',
# Don't run on trybots; waterfall is enough.
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
@ -1703,7 +1690,6 @@
'remove_from': [
'android-asan',
# Don't run on trybots; waterfall is enough.
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
@ -1718,7 +1704,6 @@
'remove_from': [
'android-asan',
# Don't run on trybots; waterfall is enough.
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
@ -1748,7 +1733,6 @@
'remove_from': [
'android-asan',
# Don't run on trybots; waterfall is enough.
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
@ -1774,7 +1758,6 @@
'network_service_webview_instrumentation_test_apk': {
# Only run these on the phone testers for now due to capacity.
'remove_from': [
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
@ -1862,7 +1845,6 @@
'android-asan',
'android-code-coverage',
'android-code-coverage-native',
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-marshmallow-x86-fyi-rel',
@ -2125,20 +2107,6 @@
},
'experiment_percentage': 100,
},
'android-kitkat-arm-rel': {
'args': [
'--browser=android-chromium',
'--device=android',
],
'swarming': {
'dimension_sets': [
{
'temp_band': '<30',
},
],
'shards': 15,
},
},
'linux-chromium-tests-staging-tests': {
'args': [
'--xvfb',
@ -2455,7 +2423,6 @@
'webview_instrumentation_test_apk': {
'remove_from': [
# This test frequently fails on Android, https://crbug.com/824959
'android-kitkat-arm-rel',
'android-lollipop-arm-rel',
'KitKat Phone Tester (dbg)',
'KitKat Tablet Tester',

@ -731,21 +731,6 @@
},
'os_type': 'android',
},
'android-kitkat-arm-rel': {
'mixins': [
'kitkat_or_lollipop',
'hammerhead',
],
'additional_compile_targets': [
'cronet_test_instrumentation_apk',
'monochrome_static_initializers',
],
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
'isolated_scripts': 'monochrome_apk_checker_isolated_script',
},
'os_type': 'android',
},
'android-lollipop-arm-rel': {
'mixins': [
'hammerhead',

@ -79,7 +79,6 @@
'android-cronet-x86-dbg': 'android_cronet_debug_static_bot_x86',
'android-cronet-x86-rel': 'android_cronet_release_bot_minimal_symbols_x86',
'android-incremental-dbg': 'android_incremental_debug_bot',
'android-kitkat-arm-rel': 'android_release_bot_minimal_symbols_fastbuild',
'android-lollipop-arm-rel': 'android_release_bot_minimal_symbols_fastbuild_webview_google',
# This bot must use the gpu_tests mixin to match 'Android FYI Release (Nexus 5X)'
@ -692,7 +691,6 @@
# TODO(crbug/597596): Switch this back to debug_trybot when cronet's
# shared library loading is fixed.
'android-cronet-arm-dbg': 'android_cronet_debug_static_bot_arm_no_neon',
'android-kitkat-arm-rel': 'android_release_trybot_fastbuild',
'android-lollipop-arm-rel': 'android_release_trybot_fastbuild_webview_google',
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_whitelisting_fastbuild_java_coverage',
'android-marshmallow-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting',
@ -1256,11 +1254,6 @@
'use_clang_coverage', 'partial_code_coverage_instrumentation',
],
'android_release_trybot_fastbuild': [
'android', 'release_trybot', 'strip_debug_info', 'android_fastbuild',
'android_no_proguard',
],
'android_release_trybot_fastbuild_webview_google': [
'android', 'release_trybot', 'strip_debug_info', 'android_fastbuild',
'android_no_proguard', 'webview_google',

@ -203,7 +203,6 @@
'android-cronet-x86-dbg': 'android_cronet_debug_static_bot_x86',
'android-cronet-x86-rel': 'android_cronet_release_bot_minimal_symbols_x86',
'android-incremental-dbg': 'android_incremental_debug_bot',
'android-kitkat-arm-rel': 'android_release_bot_minimal_symbols_fastbuild',
'android-lollipop-arm-rel': 'android_release_bot_minimal_symbols_fastbuild_webview_google',
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
'android-marshmallow-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_resource_whitelisting',
@ -376,7 +375,6 @@
'android-cronet-arm-dbg': 'android_cronet_debug_static_bot_arm_no_neon',
'android-deterministic-dbg': 'android_debug_bot',
'android-deterministic-rel': 'android_without_codecs_release_trybot',
'android-kitkat-arm-rel': 'android_release_trybot_fastbuild',
'android-lollipop-arm-rel': 'android_release_trybot_fastbuild_webview_google',
'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_resource_whitelisting_fastbuild_java_coverage',
'android-marshmallow-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_resource_whitelisting',
@ -948,13 +946,6 @@
'strip_debug_info',
'webview_google'
],
'android_release_bot_minimal_symbols_fastbuild': [
'android',
'release_bot',
'minimal_symbols',
'strip_debug_info',
'android_fastbuild'
],
'android_release_bot_minimal_symbols_fastbuild_webview_google': [
'android',
'release_bot',
@ -1015,13 +1006,6 @@
'use_clang_coverage',
'partial_code_coverage_instrumentation'
],
'android_release_trybot_fastbuild': [
'android',
'release_trybot',
'strip_debug_info',
'android_fastbuild',
'android_no_proguard'
],
'android_release_trybot_fastbuild_webview_google': [
'android',
'release_trybot',