add more win/clang bots
- add a Debug builder
- add Debug and Release CPU testers on GCE
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Win-Clang-x86_64-Debug,Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug,Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release
Change-Id: I4f2d7309b36a532683f68fbdde9c7a9aaaa861ea
Reviewed-on: https://skia-review.googlesource.com/29023
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 8c15db4..f569ce4 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -59,6 +59,7 @@
"Build-Mac-Clang-x86_64-Release",
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
"Build-Win-Clang-arm64-Release-Android",
+ "Build-Win-Clang-x86_64-Debug",
"Build-Win-Clang-x86_64-Release",
"Build-Win-MSVC-x86-Debug",
"Build-Win-MSVC-x86-Debug-ANGLE",
@@ -360,6 +361,8 @@
"Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release",
"Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE",
"Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan",
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug",
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 8f586dc..b56b844 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -365,6 +365,12 @@
"Build-Win-Clang-arm64-Release-Android"
]
},
+ "Build-Win-Clang-x86_64-Debug": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Debug"
+ ]
+ },
"Build-Win-Clang-x86_64-Release": {
"priority": 0.8,
"tasks": [
@@ -2176,6 +2182,18 @@
"Upload-Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan"
]
},
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug"
+ ]
+ },
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release"
+ ]
+ },
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
"priority": 0.8,
"tasks": [
@@ -3989,6 +4007,40 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86_64-Debug": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/win_toolchain",
+ "path": "t",
+ "version": "version:6"
+ },
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:0"
+ }
+ ],
+ "dimensions": [
+ "gpu:none",
+ "os:Windows-2008ServerR2-SP1",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Debug",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-Clang-x86_64-Release": {
"cipd_packages": [
{
@@ -16381,6 +16433,102 @@
"max_attempts": 1,
"priority": 0.8
},
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:26"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:78"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:5"
+ }
+ ],
+ "dependencies": [
+ "Build-Win-Clang-x86_64-Debug",
+ "Housekeeper-PerCommit-BundleRecipes"
+ ],
+ "dimensions": [
+ "cpu:x86-64",
+ "gpu:none",
+ "os:Windows-2008ServerR2-SP1",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "test",
+ "repository=<(REPO)",
+ "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug",
+ "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_win.isolate",
+ "max_attempts": 1,
+ "priority": 0.8
+ },
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skimage",
+ "path": "skimage",
+ "version": "version:26"
+ },
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:78"
+ },
+ {
+ "name": "skia/bots/svg",
+ "path": "svg",
+ "version": "version:5"
+ }
+ ],
+ "dependencies": [
+ "Build-Win-Clang-x86_64-Release",
+ "Housekeeper-PerCommit-BundleRecipes"
+ ],
+ "dimensions": [
+ "cpu:x86-64",
+ "gpu:none",
+ "os:Windows-2008ServerR2-SP1",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "test",
+ "repository=<(REPO)",
+ "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release",
+ "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_win.isolate",
+ "max_attempts": 1,
+ "priority": 0.8
+ },
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
"cipd_packages": [
{
@@ -22357,6 +22505,60 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
+ "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug": {
+ "dependencies": [
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Debian-9.0",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_dm_results",
+ "repository=<(REPO)",
+ "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug",
+ "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-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release": {
+ "dependencies": [
+ "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Debian-9.0",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_dm_results",
+ "repository=<(REPO)",
+ "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release",
+ "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-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
"dependencies": [
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"