rm release swiftshader msan bots
They're not any faster than the debug ones.
Change-Id: I793706d36bd868277db2b6e39a53cb4e1075e0b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271880
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 3035b52..0c9ca4f 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -69,7 +69,6 @@
"Build-Debian9-Clang-x86_64-Release-SkVM_MSAN",
"Build-Debian9-Clang-x86_64-Release-Static",
"Build-Debian9-Clang-x86_64-Release-SwiftShader",
- "Build-Debian9-Clang-x86_64-Release-SwiftShader_MSAN",
"Build-Debian9-Clang-x86_64-Release-TSAN",
"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan",
"Build-Debian9-Clang-x86_64-Release-Vulkan",
@@ -411,7 +410,6 @@
"Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader",
"Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN",
"Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader",
- "Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader_MSAN",
"Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All",
"Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan",
"Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 0bcedc9..f120066 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -354,11 +354,6 @@
"Build-Debian9-Clang-x86_64-Release-SwiftShader"
]
},
- "Build-Debian9-Clang-x86_64-Release-SwiftShader_MSAN": {
- "tasks": [
- "Build-Debian9-Clang-x86_64-Release-SwiftShader_MSAN"
- ]
- },
"Build-Debian9-Clang-x86_64-Release-TSAN": {
"tasks": [
"Build-Debian9-Clang-x86_64-Release-TSAN"
@@ -2077,11 +2072,6 @@
"Upload-Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader"
]
},
- "Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader_MSAN": {
- "tasks": [
- "Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader_MSAN"
- ]
- },
"Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
"tasks": [
"Upload-Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All"
@@ -8498,90 +8488,6 @@
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Build-Debian9-Clang-x86_64-Release-SwiftShader_MSAN": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- },
- {
- "name": "ccache",
- "path": "cache/ccache"
- }
- ],
- "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": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:19"
- },
- {
- "name": "skia/bots/cmake_linux",
- "path": "cmake_linux",
- "version": "version:0"
- },
- {
- "name": "skia/bots/ccache_linux",
- "path": "ccache_linux",
- "version": "version:1"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "-u",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "compile",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SwiftShader_MSAN\",\"swarm_out_dir\":\"build\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highcpu-64",
- "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"
- },
- "idempotent": true,
- "io_timeout_ns": 3600000000000,
- "isolate": "compile.isolate",
- "max_attempts": 2,
- "outputs": [
- "build"
- ],
- "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Build-Debian9-Clang-x86_64-Release-TSAN": {
"caches": [
{
@@ -34213,90 +34119,6 @@
"test"
]
},
- "Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader_MSAN": {
- "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": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:40"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:225"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:9"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:19"
- }
- ],
- "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-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader_MSAN\",\"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-x86_64-Release-SwiftShader_MSAN"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "machine_type:n1-standard-16",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 32400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 32400000000000,
- "isolate": "test_skia_bundled.isolate",
- "max_attempts": 1,
- "outputs": [
- "test"
- ]
- },
"Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
"caches": [
{
