remove redundant CPU bots
The Nexus5 bots cover all the same things as these.
Change-Id: I2e4c685dd70c5fa75e745edacecdd3c1e1adb9ce
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234376
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index d4f9e7b..f947c4f 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -181,7 +181,6 @@
"Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android",
"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android",
"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan",
- "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android",
"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android",
"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan",
@@ -331,8 +330,6 @@
"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan",
"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android",
"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan",
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android",
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android",
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android",
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android",
"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 556fb1ba..d6ecb45 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -922,11 +922,6 @@
"Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan"
]
},
- "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "tasks": [
- "Upload-Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android"
- ]
- },
"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
"tasks": [
"Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"
@@ -1677,16 +1672,6 @@
"Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan"
]
},
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
- "tasks": [
- "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android"
- ]
- },
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "tasks": [
- "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android"
- ]
- },
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
"tasks": [
"Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android"
@@ -15994,72 +15979,6 @@
"perf"
]
},
- "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "perf",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Build-Debian9-Clang-arm-Release-Android",
- "Housekeeper-PerCommit-IsolateSKP",
- "Housekeeper-PerCommit-IsolateSVG",
- "Housekeeper-PerCommit-IsolateSkImage"
- ],
- "dimensions": [
- "device_os:LMY47V_1836172",
- "device_type:grouper",
- "os:Android",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "isolate": "perf_skia_bundled.isolate",
- "max_attempts": 2,
- "outputs": [
- "perf"
- ]
- },
"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
"caches": [
{
@@ -27040,138 +26959,6 @@
"test"
]
},
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Build-Debian9-Clang-arm-Debug-Android",
- "Housekeeper-PerCommit-IsolateSKP",
- "Housekeeper-PerCommit-IsolateSVG",
- "Housekeeper-PerCommit-IsolateSkImage"
- ],
- "dimensions": [
- "device_os:LMY47V_1836172",
- "device_type:grouper",
- "os:Android",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "isolate": "test_skia_bundled.isolate",
- "max_attempts": 2,
- "outputs": [
- "test"
- ]
- },
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Build-Debian9-Clang-arm-Release-Android",
- "Housekeeper-PerCommit-IsolateSKP",
- "Housekeeper-PerCommit-IsolateSVG",
- "Housekeeper-PerCommit-IsolateSkImage"
- ],
- "dimensions": [
- "device_os:LMY47V_1836172",
- "device_type:grouper",
- "os:Android",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "isolate": "test_skia_bundled.isolate",
- "max_attempts": 2,
- "outputs": [
- "test"
- ]
- },
"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
"caches": [
{
@@ -49874,72 +49661,6 @@
"max_attempts": 2,
"service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.28"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "upload_nano_results",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highmem-2",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 3600000000000,
- "isolate": "swarm_recipe.isolate",
- "max_attempts": 2,
- "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
"caches": [
{
@@ -59685,138 +59406,6 @@
"max_attempts": 2,
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.28"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "upload_dm_results",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highmem-2",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 3600000000000,
- "isolate": "swarm_recipe.isolate",
- "max_attempts": 2,
- "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
- },
- "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.28"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "upload_dm_results",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highmem-2",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 3600000000000,
- "isolate": "swarm_recipe.isolate",
- "max_attempts": 2,
- "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
"caches": [
{
