remove chorizo cpu jobs
never cared about these
Bug: skia:9899
Change-Id: I1d467da491365668cbd2cb2fc606af63247b11da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270102
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index b867a65..be60077 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -204,7 +204,6 @@
"Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All",
"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All",
"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All",
- "Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All",
"Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All",
"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN",
"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs",
@@ -381,8 +380,6 @@
"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All",
"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All",
"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All",
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All",
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All",
"Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Debug-All",
"Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All",
"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 41760e3..a43717b 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1037,11 +1037,6 @@
"Upload-Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All"
]
},
- "Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "tasks": [
- "Upload-Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All"
- ]
- },
"Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All": {
"tasks": [
"Upload-Perf-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All"
@@ -1927,16 +1922,6 @@
"Upload-Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All"
]
},
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
- "tasks": [
- "Upload-Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All"
- ]
- },
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "tasks": [
- "Upload-Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All"
- ]
- },
"Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
"tasks": [
"Upload-Test-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Debug-All"
@@ -18825,71 +18810,6 @@
"perf"
]
},
- "Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "perf",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"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-Chromecast",
- "Housekeeper-PerCommit-IsolateSKP"
- ],
- "dimensions": [
- "device_os:1.30_109591",
- "device_type:chorizo",
- "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-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All": {
"caches": [
{
@@ -31773,136 +31693,6 @@
"test"
]
},
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"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-Chromecast",
- "Housekeeper-PerCommit-IsolateSKP"
- ],
- "dimensions": [
- "device_os:1.30_109591",
- "device_type:chorizo",
- "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-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"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-Chromecast",
- "Housekeeper-PerCommit-IsolateSKP"
- ],
- "dimensions": [
- "device_os:1.30_109591",
- "device_type:chorizo",
- "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-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
"caches": [
{
@@ -52882,73 +52672,6 @@
"max_attempts": 2,
"service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.46"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "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-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All"
- ],
- "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-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Release-All": {
"caches": [
{
@@ -63968,140 +63691,6 @@
"max_attempts": 2,
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.46"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "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-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Debug-All"
- ],
- "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-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.46"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "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-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Test-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All"
- ],
- "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-Chromecast-Clang-Chorizo-GPU-Cortex_A7-arm-Debug-All": {
"caches": [
{
