Skip to content

GitLab

T
tangled
Commit 98040282 authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot
Browse files
Options

emulator: Have the test suites on Pie builder running on 4-core GCE 

chrome_public_test_apk still runs on 8-core, to shorten test runtime.
Also increase the shards to 20 for content_browsertests to avoid timeout.

Bug: 922145
Change-Id: I82cf32c7afd7403f0ad7243ed29afdbb9688fa4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332444Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#814938}
parent 685145d6
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 93 deletions
testing/buildbot/chromium.android.json
View file @ 98040282
......@@ -38473,7 +38473,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38533,7 +38533,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38593,7 +38593,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38652,7 +38652,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38711,7 +38711,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38770,7 +38770,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38829,7 +38829,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38888,7 +38888,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -38947,7 +38947,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39007,7 +39007,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39067,7 +39067,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39126,7 +39126,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39185,7 +39185,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39245,7 +39245,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39304,7 +39304,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39364,7 +39364,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39423,7 +39423,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39482,7 +39482,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39679,7 +39679,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39740,7 +39740,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39799,7 +39799,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39860,7 +39860,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39886,7 +39886,7 @@
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 15
"shards": 20
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
......@@ -39923,7 +39923,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -39949,7 +39949,7 @@
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 15
"shards": 20
},
"test": "content_browsertests",
"test_id_prefix": "ninja://content/test:content_browsertests/"
......@@ -39984,7 +39984,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40047,7 +40047,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40107,7 +40107,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40167,7 +40167,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40226,7 +40226,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40285,7 +40285,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40344,7 +40344,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40403,7 +40403,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40462,7 +40462,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40521,7 +40521,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40583,7 +40583,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40642,7 +40642,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40701,7 +40701,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40760,7 +40760,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40819,7 +40819,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40878,7 +40878,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40937,7 +40937,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -40996,7 +40996,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41055,7 +41055,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41114,7 +41114,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41174,7 +41174,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41233,7 +41233,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41292,7 +41292,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41351,7 +41351,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41410,7 +41410,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41469,7 +41469,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41528,7 +41528,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41588,7 +41588,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41649,7 +41649,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41708,7 +41708,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41767,7 +41767,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41826,7 +41826,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41885,7 +41885,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41932,7 +41932,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -41982,7 +41982,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42041,7 +42041,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42100,7 +42100,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42159,7 +42159,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42218,7 +42218,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42277,7 +42277,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42337,7 +42337,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42397,7 +42397,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42456,7 +42456,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42515,7 +42515,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42574,7 +42574,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42633,7 +42633,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42692,7 +42692,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42756,7 +42756,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42817,7 +42817,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42881,7 +42881,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -42941,7 +42941,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -43000,7 +43000,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
......@@ -43059,7 +43059,7 @@
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"machine_type": "n1-standard-8",
"machine_type": "n1-standard-4",
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd"
}
testing/buildbot/mixins.pyl
View file @ 98040282
......@@ -251,16 +251,6 @@
},
},
},
'emulator-8-cores': {
'swarming': {
'dimensions': {
'device_os': None,
'device_type': None,
'pool': 'chromium.tests.avd',
'machine_type': 'n1-standard-8',
},
},
},
'flounder': {
# Nexus 9
'swarming': {
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 98040282
......@@ -771,7 +771,12 @@
'name': 'system_images_android_28_google_apis_playstore_x86',
'path': '.emulator_sdk',
},
]
],
'dimension_sets': [
{
'machine_type': 'n1-standard-8', # use 8-core to shorten runtime
},
],
},
},
},
......@@ -981,7 +986,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
],
'swarming': {
'shards': 15,
'shards': 20,
},
},
'linux-blink-heap-concurrent-marking-tsan-rel': {
......@@ -2001,7 +2006,12 @@
'name': 'system_images_android_28_google_apis_playstore_x86',
'path': '.emulator_sdk',
},
]
],
'dimension_sets': [
{
'machine_type': 'n1-standard-8', # use 8-core to shorten runtime
},
],
},
},
},
......@@ -2058,7 +2068,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
],
'swarming': {
'shards': 15,
'shards': 20,
},
},
},
......
testing/buildbot/waterfalls.pyl
View file @ 98040282
......@@ -1028,7 +1028,7 @@
'android-pie-x86-rel': {
'mixins': [
'pie-x86-emulator',
'emulator-8-cores',
'emulator-4-cores',
'linux-xenial',
'x86-64',
],
......
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