aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar borenet <borenet@chromium.org>2016-09-12 14:02:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-12 14:02:14 -0700
commitea5de1ff1dcdbfbf3e4314dc151dd1a03023cbb1 (patch)
tree47c71068414a33696b0026543b64e5e5e8cf390c /infra/bots
parentac466ff5cfd93eadcdcb1837cb73c0769fde2bb0 (diff)
Add back the GalaxyS3 and GalaxyS4 entries in recipes
S3 is needed for some recipe simulation stuff and in general having these present does not hurt us. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2336513003 Review-Url: https://codereview.chromium.org/2336513003
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipe_modules/flavor/android_flavor.py2
-rw-r--r--infra/bots/recipes/swarm_trigger.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/infra/bots/recipe_modules/flavor/android_flavor.py b/infra/bots/recipe_modules/flavor/android_flavor.py
index c379803da1..9d83544b6f 100644
--- a/infra/bots/recipe_modules/flavor/android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/android_flavor.py
@@ -32,6 +32,8 @@ def get_device(api):
# Test/Perf bots.
return {
'AndroidOne': 'arm_v7_neon',
+ 'GalaxyS3': 'arm_v7_neon',
+ 'GalaxyS4': 'arm_v7_neon',
'GalaxyS7': 'arm64',
'NVIDIA_Shield': 'arm64',
'Nexus10': 'arm_v7_neon',
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 8a61fdad52..570b1eaf80 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -113,6 +113,8 @@ def swarm_dimensions(builder_cfg):
# For Android, the device type is a better dimension than CPU or GPU.
dimensions['device_type'] = {
'AndroidOne': 'sprout',
+ 'GalaxyS3': 'm0', #'smdk4x12', Detected incorrectly by swarming?
+ 'GalaxyS4': None, # TODO(borenet,kjlubick)
'GalaxyS7': 'heroqlteatt',
'NVIDIA_Shield': 'foster',
'Nexus10': 'manta',