Skip to content

GitLab

T
tangled
Commit e012aea4 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot
Browse files
Options

Target only userdebug devices for all android swarming tests. 

Can be overwritten if a suite/bot wants something other than userdebug.

Needs to wait for https://chromium-review.googlesource.com/c/infra/luci/luci-py/+/1603622
to roll to prod.

But this dimension is present on staging devices:
https://chromium-swarm-dev.appspot.com/bot?id=build20-b4--device5

Bug: 960917
Change-Id: I9c6b95ca909d396cbd904edf4209a7484cf477fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605508
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659698}
parent 9ca47a25
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1007 additions and 5 deletions
testing/buildbot/chromium.android.fyi.json
View file @ e012aea4
......@@ -36,6 +36,7 @@
"dimension_sets": [
{
"device_os": "OPD3.170816.023",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
}
......
testing/buildbot/chromium.android.json
View file @ e012aea4
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/chromium.clang.json
View file @ e012aea4
This diff is collapsed.
testing/buildbot/chromium.fyi.json
View file @ e012aea4
......@@ -1427,6 +1427,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1475,6 +1476,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1522,6 +1524,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1568,6 +1571,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1614,6 +1618,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1661,6 +1666,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1708,6 +1714,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1755,6 +1762,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -1803,6 +1811,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3567,6 +3576,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3614,6 +3624,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3660,6 +3671,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3705,6 +3717,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3750,6 +3763,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3796,6 +3810,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3842,6 +3857,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3888,6 +3904,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -3935,6 +3952,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......
testing/buildbot/chromium.gpu.fyi.json
View file @ e012aea4
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ e012aea4
......@@ -24,6 +24,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -52,6 +53,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -80,6 +82,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -108,6 +111,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -140,6 +144,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -175,6 +180,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -218,6 +224,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -247,6 +254,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -275,6 +283,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -304,6 +313,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......
testing/buildbot/chromium.memory.json
View file @ e012aea4
This diff is collapsed.
testing/buildbot/chromium.swarm.json
View file @ e012aea4
......@@ -29,6 +29,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -73,6 +74,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -118,6 +120,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -163,6 +166,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -208,6 +212,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -253,6 +258,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -298,6 +304,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -347,6 +354,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -392,6 +400,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -437,6 +446,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -482,6 +492,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -527,6 +538,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -572,6 +584,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -617,6 +630,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -662,6 +676,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......
testing/buildbot/chromium.webrtc.fyi.json
View file @ e012aea4
......@@ -42,6 +42,7 @@
"dimension_sets": [
{
"device_os": "K",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -90,6 +91,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......
testing/buildbot/client.v8.fyi.json
View file @ e012aea4
......@@ -24,6 +24,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -52,6 +53,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -80,6 +82,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -108,6 +111,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -143,6 +147,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -186,6 +191,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -215,6 +221,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -243,6 +250,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -272,6 +280,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......@@ -302,6 +311,7 @@
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
......
testing/buildbot/generate_buildbot_json.py
View file @ e012aea4
......@@ -440,6 +440,13 @@ class BBJSONGenerator(object):
test = self.dictionary_merge(test, modifications)
if 'swarming' in test:
self.clean_swarming_dictionary(test['swarming'])
# Ensure all Android Swarming tests run only on userdebug builds if another
# build type was not specified.
if 'swarming' in test and self.is_android(tester_config):
for d in test['swarming'].get('dimension_sets', []):
if not d.get('device_os_type'):
d['device_os_type'] = 'userdebug'
return test
def add_common_test_properties(self, test, tester_config):
......
testing/buildbot/generate_buildbot_json_unittest.py
View file @ e012aea4
......@@ -454,7 +454,8 @@ ANDROID_WATERFALL = """\
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_os': 'LMY41U',
'device_os_type': 'user',
'device_type': 'hammerhead',
},
],
......@@ -1487,6 +1488,7 @@ ANDROID_WATERFALL_OUTPUT = """\
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"integrity": "high"
}
......@@ -1530,7 +1532,8 @@ ANDROID_WATERFALL_OUTPUT = """\
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os": "LMY41U",
"device_os_type": "user",
"device_type": "hammerhead",
"integrity": "high"
}
......@@ -3245,7 +3248,8 @@ TEST_QUERY_BOTS_OUTPUT = {
],
"dimension_sets":[
{
"device_os": "KTU84P",
"device_os": "LMY41U",
"device_os_type": "user",
"device_type": "hammerhead"
}
],
......@@ -3279,6 +3283,7 @@ TEST_QUERY_BOTS_OUTPUT = {
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead"
}
],
......@@ -3333,7 +3338,8 @@ TEST_QUERY_BOTS_TESTS_OUTPUT = {
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os": "LMY41U",
"device_os_type": "user",
"device_type": "hammerhead"
}
],
......@@ -3364,6 +3370,7 @@ TEST_QUERY_BOTS_TESTS_OUTPUT = {
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead"
}
],
......@@ -3407,6 +3414,7 @@ TEST_QUERY_BOT_OUTPUT = {
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead"
}
],
......@@ -3445,7 +3453,8 @@ TEST_QUERY_BOT_TESTS_OUTPUT = [
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os": "LMY41U",
"device_os_type": "user",
"device_type": "hammerhead"
}
],
......
testing/buildbot/mixins.pyl
View file @ e012aea4
......@@ -183,6 +183,7 @@
# NVIDIA SHIELD TV
'swarming': {
'dimensions': {
'device_os_type': 'user',
'device_type': 'foster',
'os': 'Android',
},
......
testing/buildbot/tryserver.chromium.android.json
View file @ e012aea4
......@@ -29,6 +29,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -73,6 +74,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......@@ -114,6 +116,7 @@
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
......
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