Add non-Valgrind PreAbandonGpuContext bot.
This may help debug timeouts for
Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext
Also stop uploading *AbandonGpuContext results to Gold.
No-Try: true
Change-Id: Ifa10d47cf27f86424d3936f451d190ee34f5637d
Reviewed-on: https://skia-review.googlesource.com/14525
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/cfg.json b/infra/bots/cfg.json
index 048e4b4..dbc3914 100644
--- a/infra/bots/cfg.json
+++ b/infra/bots/cfg.json
@@ -8,6 +8,7 @@
"MSAN",
"TSAN",
"UBSAN",
- "Valgrind"
+ "Valgrind",
+ "AbandonGpuContext"
]
}
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 7a63434..24f104c 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -283,6 +283,7 @@
"Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
"Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
"Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+ "Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 1e430ed..760f4cb 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1755,6 +1755,12 @@
"Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
]
},
+ "Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
+ "priority": 0.8,
+ "tasks": [
+ "Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext"
+ ]
+ },
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
"priority": 0.8,
"tasks": [
@@ -1914,7 +1920,7 @@
"Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext"
+ "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext"
]
},
"Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
@@ -14593,6 +14599,53 @@
"max_attempts": 1,
"priority": 0.8
},
+ "Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:24"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:50"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:5"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-GCC-x86_64-Release",
+ "Housekeeper-PerCommit-BundleRecipes"
+ ],
+ "dimensions": [
+ "gpu:10de:104a",
+ "os:Ubuntu-14.04",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "test",
+ "repository=<(REPO)",
+ "buildername=Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "io_timeout_ns": 2400000000000,
+ "isolate": "test_skia_bundled_unix.isolate",
+ "max_attempts": 1,
+ "priority": 0.8
+ },
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
"cipd_packages": [
{
@@ -22587,33 +22640,6 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext": {
- "dependencies": [
- "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext"
- ],
- "dimensions": [
- "cpu:x86-64-avx2",
- "gpu:none",
- "os:Ubuntu-14.04",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "upload_dm_results",
- "repository=<(REPO)",
- "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "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-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
"dependencies": [
"Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
