[nobuildbot] Nexus 5
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4870
Change-Id: Id8bcb72926155d8754e99e5ec5b3ae2461b22e0f
Reviewed-on: https://skia-review.googlesource.com/4870
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index ff48b76..e600e61 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -47,6 +47,8 @@
"Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
"Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
"Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
"Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
@@ -62,6 +64,8 @@
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
"Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
"Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
"Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a54b44a..e7a9715 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -110,6 +110,18 @@
"Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
]
},
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+ "priority": 0.8,
+ "tasks": [
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+ ]
+ },
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+ ]
+ },
"Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
"priority": 0.8,
"tasks": [
@@ -200,6 +212,18 @@
"Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
]
},
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+ ]
+ },
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+ ]
+ },
"Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
"priority": 0.8,
"tasks": [
@@ -858,6 +882,104 @@
"isolate": "perf_skia.isolate",
"priority": 0.8
},
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:13"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:15"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:3"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+ ],
+ "dimensions": [
+ "device_os:MOB31E",
+ "device_type:hammerhead",
+ "os:Android",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "swarm_perf",
+ "repository=<(REPO)",
+ "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_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",
+ "priority": 0.8
+ },
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:13"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:15"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:3"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-Clang-arm-Release-GN_Android"
+ ],
+ "dimensions": [
+ "device_os:MOB31E",
+ "device_type:hammerhead",
+ "os:Android",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "swarm_perf",
+ "repository=<(REPO)",
+ "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_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",
+ "priority": 0.8
+ },
"Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
"cipd_packages": [
{
@@ -1571,6 +1693,104 @@
"isolate": "test_skia.isolate",
"priority": 0.8
},
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:13"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:15"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:3"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+ ],
+ "dimensions": [
+ "device_os:MOB31E",
+ "device_type:hammerhead",
+ "os:Android",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "swarm_test",
+ "repository=<(REPO)",
+ "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_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",
+ "priority": 0.8
+ },
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:13"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:15"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:3"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-Clang-arm-Release-GN_Android"
+ ],
+ "dimensions": [
+ "device_os:MOB31E",
+ "device_type:hammerhead",
+ "os:Android",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "swarm_test",
+ "repository=<(REPO)",
+ "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_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",
+ "priority": 0.8
+ },
"Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
"cipd_packages": [
{
@@ -2068,6 +2288,35 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
+ "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "dependencies": [
+ "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Ubuntu",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_nano_results",
+ "repository=<(REPO)",
+ "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_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)"
+ ],
+ "isolate": "upload_nano_results.isolate",
+ "priority": 0.8
+ },
"Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
"dependencies": [
"Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
@@ -2387,6 +2636,64 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
+ "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+ "dependencies": [
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Ubuntu",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_dm_results",
+ "repository=<(REPO)",
+ "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_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)"
+ ],
+ "isolate": "upload_dm_results.isolate",
+ "priority": 0.8
+ },
+ "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+ "dependencies": [
+ "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Ubuntu",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_dm_results",
+ "repository=<(REPO)",
+ "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_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)"
+ ],
+ "isolate": "upload_dm_results.isolate",
+ "priority": 0.8
+ },
"Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
"dependencies": [
"Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index 178e453..9350920 100644
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -50,10 +50,6 @@
builders { name: "skia_presubmit-Trybot" }
}
buckets {
- name: "master.client.skia.android"
- builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android-Trybot" }
- }
- buckets {
name: "master.tryserver.chromium.mac"
# At time of writing, this is the fastest Chrome compile bot on average.
builders { name: "mac_chromium_compile_dbg_ng" }
@@ -61,6 +57,7 @@
buckets {
name: "skia.primary"
builders { name: "Housekeeper-PerCommit-InfraTests" }
+ builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android" }
}
try_job_retry_config {
try_job_retry_quota: 1