From a368bb31184d07fca9bc543e0566a71a4a2f09c0 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 13 Mar 2017 12:00:45 -0400 Subject: [PATCH] Add GalaxyS7_G930FD bot BUG=skia:6359 NOTRY=true Change-Id: Ic1b8034c63fdc9890044cad34ea491ad40bd9ab5 Reviewed-on: https://skia-review.googlesource.com/9546 Commit-Queue: Ben Wagner Reviewed-by: Stephan Altmueller --- infra/bots/android_map.json | 35 ++--- infra/bots/jobs.json | 4 + infra/bots/tasks.json | 314 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 336 insertions(+), 17 deletions(-) diff --git a/infra/bots/android_map.json b/infra/bots/android_map.json index df56674..d799f7e 100644 --- a/infra/bots/android_map.json +++ b/infra/bots/android_map.json @@ -1,19 +1,20 @@ { - "AndroidOne": ["sprout", "MOB30Q"], - "GalaxyS6": ["zerofltetmo", "MMB29K"], - "GalaxyS7_G930A": ["heroqlteatt", "MMB29M"], - "GalaxyJ5": ["j5xnlte", "MMB29M"], - "GalaxyTab3": ["goyawifi", "JDQ39"], - "MotoG4": ["athene", "MPJ24.139-64"], - "NVIDIA_Shield": ["foster", "MRA58K"], - "Nexus10": ["manta", "LMY49J"], - "Nexus5": ["hammerhead", "M4B30Z"], - "Nexus6": ["shamu", "M"], - "Nexus6p": ["angler", "NMF26C"], - "Nexus7": ["grouper", "LMY47V"], - "Nexus7v2": ["flo", "M"], - "NexusPlayer": ["fugu", "N2G10B"], - "Pixel": ["sailfish", "NMF26Q"], - "PixelC": ["dragon", "NMF26H"], - "PixelXL": ["marlin", "NMF26Q"] + "AndroidOne": ["sprout", "MOB30Q"], + "GalaxyS6": ["zerofltetmo", "MMB29K"], + "GalaxyS7_G930A": ["heroqlteatt", "MMB29M"], + "GalaxyS7_G930FD": ["herolte", "NRD90M"], + "GalaxyJ5": ["j5xnlte", "MMB29M"], + "GalaxyTab3": ["goyawifi", "JDQ39"], + "MotoG4": ["athene", "MPJ24.139-64"], + "NVIDIA_Shield": ["foster", "MRA58K"], + "Nexus10": ["manta", "LMY49J"], + "Nexus5": ["hammerhead", "M4B30Z"], + "Nexus6": ["shamu", "M"], + "Nexus6p": ["angler", "NMF26C"], + "Nexus7": ["grouper", "LMY47V"], + "Nexus7v2": ["flo", "M"], + "NexusPlayer": ["fugu", "N2G10B"], + "Pixel": ["sailfish", "NMF26Q"], + "PixelC": ["dragon", "NMF26H"], + "PixelXL": ["marlin", "NMF26Q"] } diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 9851243..678f569 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -79,6 +79,8 @@ "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android", "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android", "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android", + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android", + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android", "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android", "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android", @@ -184,6 +186,8 @@ "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android", "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android", "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android", + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android", + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android", "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android", "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index d6e3166..07633c5 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -482,6 +482,18 @@ "Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android" ] }, + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": { + "priority": 0.8, + "tasks": [ + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android" + ] + }, + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "priority": 0.8, + "tasks": [ + "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android" + ] + }, "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": { "priority": 0.8, "tasks": [ @@ -1112,6 +1124,18 @@ "Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android" ] }, + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android" + ] + }, + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android" + ] + }, "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": { "priority": 0.8, "tasks": [ @@ -4312,6 +4336,106 @@ "max_attempts": 1, "priority": 0.8 }, + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:22" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:39" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-Clang-arm64-Debug-Android" + ], + "dimensions": [ + "device_os:NRD90M", + "device_type:herolte", + "os:Android", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "perf_skia.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:22" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:39" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-Clang-arm64-Release-Android" + ], + "dimensions": [ + "device_os:NRD90M", + "device_type:herolte", + "os:Android", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "perf_skia.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": { "cipd_packages": [ { @@ -9523,6 +9647,106 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:22" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:39" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-Clang-arm64-Debug-Android" + ], + "dimensions": [ + "device_os:NRD90M", + "device_type:herolte", + "os:Android", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_test", + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:22" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:39" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-Clang-arm64-Release-Android" + ], + "dimensions": [ + "device_os:NRD90M", + "device_type:herolte", + "os:Android", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_test", + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": { "cipd_packages": [ { @@ -14858,6 +15082,36 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, + "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "dependencies": [ + "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_nano_results", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": { "dependencies": [ "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android" @@ -16418,6 +16672,66 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": { + "dependencies": [ + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": { + "dependencies": [ + "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android" + ], + "dimensions": [ + "cpu:x86-64-avx2", + "gpu:none", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, "Upload-Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": { "dependencies": [ "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android" -- 2.7.4