diff options
Diffstat (limited to 'infra/bots/tasks.json')
-rw-r--r-- | infra/bots/tasks.json | 87444 |
1 files changed, 14612 insertions, 72832 deletions
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 7dc608c7b7..27e8598062 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -3403,84 +3403,7 @@ }, "tasks": { "Build-Debian9-Clang-arm-Debug-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -3489,104 +3412,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Debug-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Debug-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -3595,58 +3438,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Debug-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Debug-Chromebook_GLES": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -3662,157 +3472,30 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -3821,104 +3504,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Android_API26": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_API26\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -3927,104 +3530,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android_API26", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4033,104 +3556,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android_ASAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4139,104 +3582,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4245,58 +3608,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm-Release-Chromebook_GLES": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -4312,157 +3642,30 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Debug-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4471,104 +3674,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Debug-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Debug-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4577,104 +3700,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4683,104 +3726,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Release-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4789,104 +3752,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Release-Android_ASAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -4895,104 +3778,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-arm64-Release-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5001,191 +3804,47 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "android_compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "android_compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework", + "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-Debian9-Clang-x64-Debug-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5194,104 +3853,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x64-Debug-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x64-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5300,214 +3879,54 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x64-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86-Debug-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5516,104 +3935,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Debug-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86-Debug-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5622,104 +3961,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Debug-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5728,104 +3987,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86-Release-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -5834,278 +4013,85 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Release-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-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)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-ASAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -6116,111 +4102,31 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -6231,551 +4137,151 @@ "version": "version:2" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-Coverage", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-MSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-MSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-MSAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-SafeStack": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SafeStack\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-SafeStack", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -6786,111 +4292,31 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -6901,441 +4327,121 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-ASAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -7346,111 +4452,31 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-Chromebook_GLES": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -7461,1101 +4487,301 @@ "version": "version:2" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-Chromebook_GLES", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-Fast": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Fast\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-Fast", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-Mini": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Mini\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-Mini", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-NoDEPS": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-NoDEPS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-NoDEPS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-ParentRevision": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ParentRevision\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-ParentRevision", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-TSAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -8566,111 +4792,31 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-Clang-x86_64-Release-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" @@ -8681,221 +4827,61 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86_64-Release-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-EMCC-wasm-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/emscripten_sdk", "path": "emscripten_sdk", "version": "version:2" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-EMCC-wasm-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-arm-Debug-Chromecast": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/cast_toolchain", "path": "cast_toolchain", "version": "version:4" @@ -8906,111 +4892,31 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-arm-Debug-Chromecast\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-arm-Debug-Chromecast", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-arm-Release-Chromecast": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/cast_toolchain", "path": "cast_toolchain", "version": "version:4" @@ -9021,1332 +4927,311 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-arm-Release-Chromecast\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-arm-Release-Chromecast", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-loongson3a-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-loongson3a-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-loongson3a-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-loongson3a-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-loongson3a-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-loongson3a-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-mips64el-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-mips64el-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-mips64el-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-mips64el-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-mips64el-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-mips64el-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86-Debug": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86-Release": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Debug": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Debug-EmbededResouces": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Debug-EmbededResouces\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Debug-EmbededResouces", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Debug-NoGPU": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Debug-NoGPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Debug-NoGPU", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-EmbededResouces": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-EmbededResouces\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-EmbededResouces", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-Flutter_Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-Flutter_Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateAndroidNDKLinux" ], "dimensions": [ @@ -10355,2005 +5240,451 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-Flutter_Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-NoGPU": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-NoGPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-NoGPU", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-PDFium": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-PDFium\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-PDFium", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Debian9-GCC-x86_64-Release-Shared": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-Shared\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Debian9-GCC-x86_64-Release-Shared", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-arm-Debug-iOS": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm-Debug-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Debug-iOS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-arm-Release-iOS": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Release-iOS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-arm64-Debug-Android": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/android_ndk_darwin", "path": "android_ndk_darwin", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm64-Debug-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-arm64-Debug-iOS": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm64-Debug-iOS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-arm64-Release-iOS": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm64-Release-iOS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x64-Release-iOS": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x64-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x64-Release-iOS", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Debug": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-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)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Debug-ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Debug-ASAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Debug-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Debug-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Debug-Metal": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Debug-Metal", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Release": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Release-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Release-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Mac-Clang-x86_64-Release-TSAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-x86_64-Release-TSAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-arm64-Release-Android": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/android_ndk_windows", "path": "n", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", @@ -12361,109 +5692,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-arm64-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -12473,109 +5726,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86-Debug-Exceptions": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Debug-Exceptions\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -12585,109 +5760,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86-Debug-Exceptions", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -12697,109 +5794,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Debug": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -12809,109 +5828,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "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)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Debug-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -12921,109 +5862,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Debug-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Debug-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13033,109 +5896,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Debug-UBSAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Debug-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain", "Housekeeper-PerCommit-IsolateWinVulkanSDK" ], @@ -13146,109 +5931,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Debug-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Release": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13258,109 +5965,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Release-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13370,109 +5999,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Release-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Release-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13482,109 +6033,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Release-UBSAN", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-Clang-x86_64-Release-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_win", "path": "clang_win", "version": "version:5" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain", "Housekeeper-PerCommit-IsolateWinVulkanSDK" ], @@ -13595,104 +6068,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-Clang-x86_64-Release-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86-Debug": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13702,104 +6095,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86-Release": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13809,104 +6122,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86_64-Debug": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -13916,104 +6149,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86_64-Debug", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86_64-Debug-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain", "Housekeeper-PerCommit-IsolateWinVulkanSDK" ], @@ -14024,104 +6177,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86_64-Debug-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86_64-Release": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain" ], "dimensions": [ @@ -14131,104 +6204,24 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86_64-Release", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Build-Win-MSVC-x86_64-Release-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "compile", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateWinToolchain", "Housekeeper-PerCommit-IsolateWinVulkanSDK" ], @@ -14239,109 +6232,31 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "build" + "extra_args": [ + "--workdir", + "../../..", + "compile", + "repository=<(REPO)", + "buildername=Build-Win-MSVC-x86_64-Release-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "skia/bots/go", - "path": "go", - "version": "version:4" + "name": "skia/bots/clang_linux", + "path": "clang_linux", + "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "calmbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Release", "Build-Debian9-Clang-x86_64-Release-ParentRevision", "Housekeeper-PerCommit-IsolateSKP", @@ -14352,108 +6267,31 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "calmbench", + "repository=<(REPO)", + "buildername=Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "isolate": "calmbench.isolate", "priority": 0.8 }, "Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "skia/bots/go", - "path": "go", - "version": "version:4" + "name": "skia/bots/clang_linux", + "path": "clang_linux", + "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "calmbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Release", "Build-Debian9-Clang-x86_64-Release-ParentRevision", "Housekeeper-PerCommit-IsolateSKP", @@ -14464,93 +6302,31 @@ "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "calmbench", + "repository=<(REPO)", + "buildername=Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "isolate": "calmbench.isolate", "priority": 0.8 }, "Housekeeper-Nightly-Bookmaker": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "bookmaker", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Nightly-Bookmaker\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-x86_64-Release" ], "dimensions": [ @@ -14559,304 +6335,88 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 7200000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, + "extra_args": [ + "--workdir", + "../../..", + "bookmaker", + "repository=<(REPO)", + "buildername=Housekeeper-Nightly-Bookmaker", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], "io_timeout_ns": 7200000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Housekeeper-Nightly-RecreateSKPs_Canary": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "recreate_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Nightly-RecreateSKPs_Canary\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "recreate_skps", + "repository=<(REPO)", + "buildername=Housekeeper-Nightly-RecreateSKPs_Canary", + "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": "compile_skia.isolate", + "priority": 0.8 }, "Housekeeper-Nightly-UpdateMetaConfig": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "update_meta_config", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Nightly-UpdateMetaConfig\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-update-meta-config@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "update_meta_config", + "repository=<(REPO)", + "buildername=Housekeeper-Nightly-UpdateMetaConfig", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "meta_config.isolate", + "priority": 0.8 }, "Housekeeper-PerCommit": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "housekeeper", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-PerCommit\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-x86_64-Release-Shared" ], "dimensions": [ @@ -14865,91 +6425,31 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-housekeeper@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "housekeeper", + "repository=<(REPO)", + "buildername=Housekeeper-PerCommit", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "housekeeper_skia.isolate", + "priority": 0.8 }, "Housekeeper-PerCommit-Bookmaker": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "bookmaker", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-PerCommit-Bookmaker\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-x86_64-Release" ], "dimensions": [ @@ -14958,255 +6458,105 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 7200000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, + "extra_args": [ + "--workdir", + "../../..", + "bookmaker", + "repository=<(REPO)", + "buildername=Housekeeper-PerCommit-Bookmaker", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], "io_timeout_ns": 7200000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com" + "isolate": "compile_skia.isolate", + "priority": 0.8 }, "Housekeeper-PerCommit-BundleRecipes": { "cipd_packages": [ { "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" + "path": "git", + "version": "version:2.13.0.chromium9" }, { "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" + "path": "git", + "version": "git_revision:a78b5f3658c0578a017db48df97d20ac09822bcd" } ], - "command": [ - "/bin/bash", - "skia/infra/bots/bundle_recipes.sh", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ] - }, - "isolate": "swarm_recipe.isolate", + "extra_args": [ + "--workdir", + "../../..", + "bundle_recipes", + "buildername=Housekeeper-PerCommit-BundleRecipes", + "swarm_out_dir=${ISOLATED_OUTDIR}" + ], + "isolate": "bundle_recipes.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-CheckGeneratedFiles": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "check_generated_files", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-PerCommit-CheckGeneratedFiles\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "check_generated_files", + "repository=<(REPO)", + "buildername=Housekeeper-PerCommit-CheckGeneratedFiles", + "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 }, "Housekeeper-PerCommit-InfraTests": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "infra", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-PerCommit-InfraTests\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "infra", + "repository=<(REPO)", + "buildername=Housekeeper-PerCommit-InfraTests", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "infra_skia.isolate", + "priority": 0.8 }, "Housekeeper-PerCommit-IsolateAndroidNDKLinux": { "cipd_packages": [ @@ -15216,19 +6566,13 @@ "version": "version:10" } ], - "command": [ - "/bin/cp", - "-rL", - "android_ndk_linux", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_ndk_linux.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-IsolateSKP": { @@ -15239,19 +6583,13 @@ "version": "version:120" } ], - "command": [ - "/bin/cp", - "-rL", - "skp", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_skp.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-IsolateSVG": { @@ -15262,19 +6600,13 @@ "version": "version:9" } ], - "command": [ - "/bin/cp", - "-rL", - "svg", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_svg.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-IsolateSkImage": { @@ -15285,19 +6617,13 @@ "version": "version:34" } ], - "command": [ - "/bin/cp", - "-rL", - "skimage", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_skimage.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-IsolateWinToolchain": { @@ -15308,19 +6634,13 @@ "version": "version:7" } ], - "command": [ - "/bin/cp", - "-rL", - "t", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_win_toolchain.isolate", "priority": 0.7 }, "Housekeeper-PerCommit-IsolateWinVulkanSDK": { @@ -15331,180 +6651,51 @@ "version": "version:7" } ], - "command": [ - "/bin/cp", - "-rL", - "win_vulkan_sdk", - "${ISOLATED_OUTDIR}" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "isolate": "empty.isolate", + "isolate": "isolate_win_vulkan_sdk.isolate", "priority": 0.7 }, "Housekeeper-Weekly-RecreateSKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/go", "path": "go", "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "recreate_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Weekly-RecreateSKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "recreate_skps", + "repository=<(REPO)", + "buildername=Housekeeper-Weekly-RecreateSKPs", + "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": "compile_skia.isolate", + "priority": 0.8 }, "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -15515,93 +6706,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -15612,93 +6740,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -15709,93 +6774,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -15806,93 +6808,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -15903,93 +6842,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16000,93 +6876,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16097,93 +6910,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16194,93 +6944,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16291,93 +6978,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16388,93 +7012,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16485,93 +7046,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16582,93 +7080,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16679,93 +7114,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16776,93 +7148,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16873,93 +7182,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -16970,93 +7216,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17067,93 +7250,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17164,93 +7284,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17261,93 +7318,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17358,93 +7352,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17455,93 +7386,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17552,93 +7420,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17649,93 +7454,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17746,93 +7488,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17843,93 +7522,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -17940,93 +7556,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18037,93 +7590,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18134,93 +7624,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18231,93 +7658,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18328,93 +7692,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18425,93 +7726,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$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_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18522,93 +7760,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18619,93 +7794,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18716,93 +7828,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18813,93 +7862,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -18910,93 +7896,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19007,93 +7930,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19104,93 +7964,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19201,93 +7998,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19298,93 +8032,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19395,93 +8066,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19492,93 +8100,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -19587,93 +8132,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -19682,93 +8164,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19779,93 +8198,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -19874,93 +8230,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -19971,93 +8264,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20068,93 +8298,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20165,93 +8332,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20262,93 +8366,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -20357,93 +8398,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -20452,93 +8430,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "skpbench", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -20547,93 +8462,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "skpbench_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "skpbench", + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench", + "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": "skpbench_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20644,93 +8496,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20741,93 +8530,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20838,93 +8564,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -20935,93 +8598,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21032,93 +8632,30 @@ "pool:Skia", "release_version:10176.5.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21129,93 +8666,30 @@ "pool:Skia", "release_version:10176.5.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21226,93 +8700,30 @@ "pool:Skia", "release_version:10032.17.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21323,93 +8734,30 @@ "pool:Skia", "release_version:10032.17.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21420,93 +8768,30 @@ "pool:Skia", "release_version:9901.12.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21517,93 +8802,30 @@ "pool:Skia", "release_version:9901.12.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21614,93 +8836,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -21711,93 +8870,30 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Debug-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -21806,93 +8902,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Release-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -21901,93 +8934,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Debug-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -21996,93 +8966,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Release-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -22091,46 +8998,29 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22146,99 +9036,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86-Debug" + "Build-Debian9-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22254,99 +9083,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22367,99 +9135,38 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN" + "Build-Debian9-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22480,99 +9187,38 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-MSAN" + "Build-Debian9-Clang-x86_64-Debug-MSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22588,99 +9234,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22696,99 +9281,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-SafeStack" + "Build-Debian9-Clang-x86_64-Debug-SafeStack", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22804,99 +9328,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -22917,99 +9380,38 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN" + "Build-Debian9-Clang-x86_64-Release-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23025,99 +9427,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Fast" + "Build-Debian9-Clang-x86_64-Release-Fast", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23133,99 +9474,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER" + "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23241,99 +9521,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Skylake_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23349,99 +9568,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Skylake_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23457,99 +9615,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86-Debug" + "Build-Debian9-GCC-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23565,99 +9662,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Debug" + "Build-Debian9-GCC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23673,99 +9709,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release" + "Build-Debian9-GCC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23781,99 +9756,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23889,99 +9803,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -23997,99 +9850,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release-CommandBuffer" + "Build-Mac-Clang-x86_64-Release-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24105,99 +9897,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24213,99 +9944,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24321,99 +9991,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release-CommandBuffer" + "Build-Mac-Clang-x86_64-Release-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24429,99 +10038,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24537,99 +10085,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug-ASAN" + "Build-Mac-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24645,99 +10132,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24753,53 +10179,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -24807,46 +10189,29 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24862,53 +10227,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -24916,46 +10237,29 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -24971,53 +10275,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release-CommandBuffer" + "Build-Mac-Clang-x86_64-Release-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -25025,260 +10285,89 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "ct_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "pool:SkiaCT", "os:Debian-9.4" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 86400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 86400000000000, - "isolate": "skia_repo.isolate", - "priority": 0.8, - "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "ct_skps", + "repository=<(REPO)", + "buildername=Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "ct_skps_skia.isolate", + "priority": 0.8 }, "Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "ct_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "pool:SkiaCT", "os:Debian-9.4" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 86400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 86400000000000, - "isolate": "skia_repo.isolate", - "priority": 0.8, - "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "ct_skps", + "repository=<(REPO)", + "buildername=Perf-Ubuntu14-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-CT_BENCH_1k_SKPs", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "ct_skps_skia.isolate", + "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25299,99 +10388,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25417,99 +10445,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25530,99 +10497,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25648,99 +10554,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25761,99 +10606,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25879,99 +10663,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -25992,99 +10715,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26110,99 +10772,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26223,99 +10824,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0f31", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26336,99 +10876,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0f31", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26449,99 +10928,38 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0102", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26562,99 +10980,38 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0102", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26670,99 +11027,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26783,99 +11079,38 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN" + "Build-Debian9-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -26896,99 +11131,38 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27004,99 +11178,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27117,99 +11230,38 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN" + "Build-Debian9-Clang-x86_64-Release-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27230,99 +11282,38 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27343,53 +11334,9 @@ "version": "version:7" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", @@ -27397,46 +11344,29 @@ "pool:Skia", "valgrind:1" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "io_timeout_ns": 3600000000000, + "isolate": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27457,53 +11387,9 @@ "version": "version:7" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", @@ -27511,46 +11397,29 @@ "pool:Skia", "valgrind:1" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "io_timeout_ns": 3600000000000, + "isolate": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27566,99 +11435,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27674,99 +11482,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27782,99 +11529,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27890,99 +11576,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -27998,99 +11623,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28106,99 +11670,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28214,99 +11717,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28322,99 +11764,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28430,99 +11811,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28538,99 +11858,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28646,99 +11905,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28754,99 +11952,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28862,99 +11999,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -28970,99 +12046,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29078,99 +12093,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29186,99 +12140,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29294,99 +12187,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29402,99 +12234,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29510,99 +12281,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29618,99 +12328,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29726,99 +12375,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29834,99 +12422,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -29942,99 +12469,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30050,99 +12516,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30158,99 +12563,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30266,99 +12610,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30374,99 +12657,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30482,99 +12704,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30590,99 +12751,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30698,99 +12798,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30806,99 +12845,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -30914,99 +12892,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31022,99 +12939,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31130,99 +12986,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31238,99 +13033,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31346,99 +13080,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31454,99 +13127,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31562,99 +13174,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31670,99 +13221,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31778,99 +13268,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31886,99 +13315,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -31994,99 +13362,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32102,53 +13409,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32156,46 +13419,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32211,53 +13457,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32265,46 +13467,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32320,53 +13505,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32374,46 +13515,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32429,53 +13553,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32483,46 +13563,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32538,53 +13601,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32592,46 +13611,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32647,53 +13649,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -32701,46 +13659,29 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32756,99 +13697,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32864,99 +13744,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -32972,99 +13791,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33080,99 +13838,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33188,99 +13885,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33296,99 +13932,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33404,99 +13979,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug" + "Build-Win-MSVC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33512,99 +14026,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug-Vulkan" + "Build-Win-MSVC-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33620,99 +14073,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release" + "Build-Win-MSVC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33728,99 +14120,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release-Vulkan" + "Build-Win-MSVC-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33836,53 +14167,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -33890,46 +14177,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -33945,53 +14215,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -33999,46 +14225,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34054,53 +14263,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-UBSAN" + "Build-Win-Clang-x86_64-Debug-UBSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34108,46 +14273,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34163,53 +14311,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34217,46 +14321,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34272,53 +14359,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-UBSAN" + "Build-Win-Clang-x86_64-Release-UBSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34326,46 +14369,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34381,53 +14407,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86-Debug" + "Build-Win-MSVC-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34435,46 +14417,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34490,53 +14455,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug" + "Build-Win-MSVC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34544,46 +14465,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34599,53 +14503,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release" + "Build-Win-MSVC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -34653,46 +14513,29 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34708,99 +14551,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-2008ServerR2-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34816,99 +14598,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-2008ServerR2-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -34924,99 +14645,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -35032,99 +14692,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -35140,99 +14739,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -35248,146 +14786,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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": "perf_skia_bundled_win.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35397,93 +14828,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35493,93 +14861,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35589,93 +14894,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35685,93 +14927,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35781,93 +14960,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "perf", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35877,93 +14993,30 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "perf_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "perf" + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All", + "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": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -35974,93 +15027,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android", + "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-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36071,93 +15062,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android", + "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-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36168,93 +15097,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts", + "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36265,93 +15132,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36362,93 +15167,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android", + "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-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36459,93 +15202,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36556,93 +15237,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android", + "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-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36653,93 +15272,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36750,93 +15307,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android", + "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36847,93 +15342,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android", + "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -36944,93 +15377,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37041,93 +15412,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37138,93 +15447,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37235,93 +15482,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37332,93 +15517,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37429,93 +15552,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37526,93 +15587,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android", + "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37623,93 +15622,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android", + "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37720,93 +15657,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android", + "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37817,93 +15692,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -37914,93 +15727,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38011,94 +15762,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_ASAN", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38109,93 +15798,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38206,93 +15833,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38303,94 +15868,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_ASAN", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38401,93 +15904,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android_ASAN", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38498,93 +15939,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38595,93 +15974,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38692,93 +16009,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38789,93 +16044,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38886,94 +16079,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_ASAN", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -38984,94 +16115,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39082,93 +16151,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_ASAN_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39179,93 +16186,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39276,93 +16221,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39373,93 +16256,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39470,93 +16291,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39567,93 +16326,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39664,93 +16361,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39761,93 +16396,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39858,94 +16431,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_ASAN", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -39956,94 +16467,32 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan", "Housekeeper-PerCommit-IsolateAndroidNDKLinux", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40054,93 +16503,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40151,93 +16538,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40248,93 +16573,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40345,93 +16608,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40442,93 +16643,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40539,93 +16678,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android", + "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-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40636,93 +16713,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android", + "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-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40733,93 +16748,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android", + "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-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40830,93 +16783,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android", + "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-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -40927,93 +16818,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android", + "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-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41024,93 +16853,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41121,93 +16888,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41218,93 +16923,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41315,93 +16958,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41412,93 +16993,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41509,93 +17028,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41606,93 +17063,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41703,93 +17098,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41800,93 +17133,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41897,93 +17168,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -41994,93 +17203,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Debug-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42091,93 +17238,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42188,93 +17273,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android_Vulkan", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42285,93 +17308,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan", + "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-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42382,93 +17343,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All", + "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-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42479,93 +17378,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All", + "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-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42576,93 +17413,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All", + "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-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42673,93 +17448,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All", + "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-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42770,93 +17483,31 @@ "pool:Skia", "release_version:10176.5.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All", + "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-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42867,93 +17518,31 @@ "pool:Skia", "release_version:10176.5.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All", + "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-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -42964,93 +17553,31 @@ "pool:Skia", "release_version:10032.17.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All", + "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-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86_64-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -43061,93 +17588,31 @@ "pool:Skia", "release_version:10032.17.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All", + "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-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -43158,93 +17623,31 @@ "pool:Skia", "release_version:9901.12.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All", + "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-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -43255,93 +17658,31 @@ "pool:Skia", "release_version:9901.12.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All", + "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-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Debug-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -43352,93 +17693,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All", + "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-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Chromebook_GLES", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -43449,93 +17728,31 @@ "pool:Skia", "release_version:10172.0.0" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All", + "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-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Debug-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -43544,93 +17761,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All", + "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-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Release-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -43639,93 +17794,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All", + "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-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Debug-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -43734,93 +17827,31 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All", + "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-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-GCC-arm-Release-Chromecast", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP" ], "dimensions": [ @@ -43829,46 +17860,30 @@ "os:Android", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -43884,99 +17899,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86-Debug" + "Build-Debian9-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -43992,99 +17947,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44105,99 +18000,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN" + "Build-Debian9-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44218,99 +18053,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-MSAN" + "Build-Debian9-Clang-x86_64-Debug-MSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44326,99 +18101,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44434,99 +18149,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44542,99 +18197,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-SafeStack" + "Build-Debian9-Clang-x86_64-Debug-SafeStack", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44650,99 +18245,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_01_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44758,99 +18292,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_01_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_02_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44866,99 +18339,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_02_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_03_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -44974,99 +18386,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_03_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_04_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45082,99 +18433,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_04_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_05_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45190,99 +18480,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_05_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_06_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45298,99 +18527,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_06_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_07_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45406,99 +18574,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_07_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_08_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45514,99 +18621,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_08_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_09_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45622,99 +18668,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_09_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_10_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45730,99 +18715,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_10_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_11_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45838,99 +18762,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_11_12-Coverage", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -45946,99 +18809,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46059,99 +18862,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN" + "Build-Debian9-Clang-x86_64-Release-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46167,99 +18910,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Fast" + "Build-Debian9-Clang-x86_64-Release-Fast", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46275,99 +18958,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD" + "Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46383,99 +19006,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2" + "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46491,99 +19054,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46599,99 +19102,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER" + "Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46712,99 +19155,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-TSAN" + "Build-Debian9-Clang-x86_64-Release-TSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN", + "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-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46820,99 +19203,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Skylake_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -46928,99 +19251,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Skylake_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47036,99 +19299,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86-Debug" + "Build-Debian9-GCC-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47144,99 +19347,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Debug" + "Build-Debian9-GCC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47252,99 +19395,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release" + "Build-Debian9-GCC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47360,99 +19443,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47468,99 +19491,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "Build-Mac-Clang-x86_64-Debug-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47576,99 +19539,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47684,99 +19587,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:591e", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47792,99 +19635,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -47900,99 +19683,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "Build-Mac-Clang-x86_64-Debug-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48008,99 +19731,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1626", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48116,99 +19779,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48224,99 +19827,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug-ASAN" + "Build-Mac-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48332,99 +19875,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48440,99 +19923,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48548,99 +19971,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release-TSAN" + "Build-Mac-Clang-x86_64-Release-TSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2697_v2", "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48656,53 +20019,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug" + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -48710,46 +20029,30 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48765,53 +20068,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "Build-Mac-Clang-x86_64-Debug-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -48819,46 +20078,30 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48874,53 +20117,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release" + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -48928,46 +20127,30 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -48983,53 +20166,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Mac-Clang-x86_64-Release-TSAN" + "Build-Mac-Clang-x86_64-Release-TSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-4578U", @@ -49037,367 +20176,120 @@ "os:Mac-10.13.3", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-TSAN", + "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-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "ct_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "pool:SkiaCT", "os:Debian-9.4" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 86400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 86400000000000, - "isolate": "skia_repo.isolate", - "priority": 0.8, - "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "ct_skps", + "repository=<(REPO)", + "buildername=Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_100k_SKPs", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "ct_skps_skia.isolate", + "priority": 0.8 }, "Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "ct_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "pool:SkiaCT", "os:Debian-9.4" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 86400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 86400000000000, - "isolate": "skia_repo.isolate", - "priority": 0.8, - "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "ct_skps", + "repository=<(REPO)", + "buildername=Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_1m_SKPs", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "ct_skps_skia.isolate", + "priority": 0.8 }, "Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "ct_skps", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], "dimensions": [ "pool:SkiaCT", "os:Debian-9.4" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 86400000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 86400000000000, - "isolate": "skia_repo.isolate", - "priority": 0.8, - "service_account": "skia-external-ct-skps@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "ct_skps", + "repository=<(REPO)", + "buildername=Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_IMG_DECODE_100k_SKPs", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "ct_skps_skia.isolate", + "priority": 0.8 }, "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49418,99 +20310,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49536,99 +20368,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49649,99 +20421,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49767,99 +20479,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:22b1", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49880,99 +20532,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -49998,99 +20590,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50111,99 +20643,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50229,99 +20701,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:5926", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", + "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-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50342,99 +20754,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0f31", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50455,99 +20807,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0f31", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", + "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-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50568,99 +20860,39 @@ "version": "version:4" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0102", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All", + "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-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50681,99 +20913,39 @@ "version": "version:6" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0102", "os:Ubuntu-16.10", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50789,99 +20961,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -50902,99 +21014,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN" + "Build-Debian9-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51010,99 +21062,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51123,99 +21115,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51231,99 +21163,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" + "Build-Debian9-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51344,99 +21216,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN" + "Build-Debian9-Clang-x86_64-Debug-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51462,99 +21274,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan" + "Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51575,99 +21327,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51688,99 +21380,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan" + "Build-Debian9-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51796,99 +21428,38 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage" + "Build-Debian9-Clang-x86_64-Debug-Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Coverage", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Vulkan_Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -51909,99 +21480,38 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"coverage\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage" + "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "coverage" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Vulkan_Coverage", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52017,99 +21527,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52130,99 +21580,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN" + "Build-Debian9-Clang-x86_64-Release-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52243,99 +21633,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN" + "Build-Debian9-Clang-x86_64-Release-ASAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52361,99 +21691,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan" + "Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_ASAN_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52474,99 +21744,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-TSAN" + "Build-Debian9-Clang-x86_64-Release-TSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52592,99 +21802,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan" + "Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52700,99 +21850,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release" + "Build-Debian9-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52813,99 +21903,39 @@ "version": "version:11" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-TSAN" + "Build-Debian9-Clang-x86_64-Release-TSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -52926,99 +21956,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Release-Vulkan" + "Build-Debian9-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", "os:Ubuntu-17.04", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53039,53 +22009,9 @@ "version": "version:7" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", @@ -53093,46 +22019,30 @@ "pool:Skia", "valgrind:1" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "io_timeout_ns": 3600000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53153,53 +22063,9 @@ "version": "version:7" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", @@ -53207,46 +22073,30 @@ "pool:Skia", "valgrind:1" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "io_timeout_ns": 3600000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53267,53 +22117,9 @@ "version": "version:7" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41" + "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-384.59", @@ -53321,46 +22127,30 @@ "pool:Skia", "valgrind:1" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 32400000000000, "expiration_ns": 172800000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 32400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "io_timeout_ns": 3600000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, "priority": 0.8 }, "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53376,99 +22166,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All", + "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-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53484,99 +22214,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53592,99 +22262,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53700,99 +22310,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All", + "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-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53808,99 +22358,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE", + "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-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -53916,99 +22406,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:6646-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan", + "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-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54024,99 +22454,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All", + "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-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54132,99 +22502,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54240,99 +22550,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All", + "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-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54348,99 +22598,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:104a-23.21.13.9101", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54456,99 +22646,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54564,99 +22694,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54672,99 +22742,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54785,99 +22795,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -54893,99 +22843,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55001,99 +22891,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55109,99 +22939,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55217,99 +22987,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55330,99 +23040,39 @@ "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump", + "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-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55438,99 +23088,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-5557U", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts", + "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-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55546,99 +23136,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All", + "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-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55654,99 +23184,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55762,99 +23232,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All", + "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-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55870,99 +23280,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:162b-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -55978,99 +23328,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56086,99 +23376,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56194,99 +23424,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56302,99 +23472,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56410,99 +23520,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56518,99 +23568,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", + "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-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56626,99 +23616,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:1926-23.20.16.4982", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "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-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56734,99 +23664,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", + "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-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56842,99 +23712,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -56950,99 +23760,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", + "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-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57058,99 +23808,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:8086:0a16-20.19.15.4835", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57166,99 +23856,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57274,99 +23904,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57382,99 +23952,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57490,99 +24000,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57598,99 +24048,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE", + "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-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57706,99 +24096,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:11c0-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57814,99 +24144,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -57922,99 +24192,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58030,99 +24240,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58138,99 +24288,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58246,99 +24336,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE", + "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-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58354,99 +24384,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:1002:683d-23.20.15017.4003", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58462,53 +24432,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -58516,46 +24442,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58571,53 +24481,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -58625,46 +24491,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58680,53 +24530,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -58734,46 +24540,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58789,53 +24579,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -58843,46 +24589,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -58898,53 +24628,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -58952,46 +24638,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE", + "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-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59007,53 +24677,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-i7-6700K", @@ -59061,46 +24687,30 @@ "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59116,99 +24726,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59224,99 +24774,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-ANGLE" + "Build-Win-Clang-x86_64-Debug-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59332,99 +24822,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-Vulkan" + "Build-Win-Clang-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59440,99 +24870,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59548,99 +24918,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-ANGLE" + "Build-Win-Clang-x86_64-Release-ANGLE", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE", + "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-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59656,99 +24966,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-Vulkan" + "Build-Win-Clang-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1ba1-23.21.13.9101", "os:Windows-10-16299.371", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan", + "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-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59764,99 +25014,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug" + "Build-Win-MSVC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59872,99 +25062,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug-Vulkan" + "Build-Win-MSVC-x86_64-Debug-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -59980,99 +25110,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release" + "Build-Win-MSVC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60088,99 +25158,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release-Vulkan" + "Build-Win-MSVC-x86_64-Release-Vulkan", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-10-16299.309", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60196,53 +25206,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60250,46 +25216,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60305,53 +25255,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Release" + "Build-Win-Clang-x86-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60359,46 +25265,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60414,53 +25304,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60468,46 +25314,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60523,53 +25353,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60577,46 +25363,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60632,53 +25402,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60686,46 +25412,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60741,53 +25451,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60795,46 +25461,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60850,53 +25500,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug-UBSAN" + "Build-Win-Clang-x86_64-Debug-UBSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -60904,46 +25510,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -60959,53 +25549,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61013,46 +25559,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61068,53 +25598,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61122,46 +25608,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61177,53 +25647,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61231,46 +25657,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61286,53 +25696,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61340,46 +25706,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61395,53 +25745,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release-UBSAN" + "Build-Win-Clang-x86_64-Release-UBSAN", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61449,46 +25755,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-UBSAN", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61504,53 +25794,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86-Debug" + "Build-Win-MSVC-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61558,46 +25804,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61613,53 +25843,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86-Release" + "Build-Win-MSVC-x86-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61667,46 +25853,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61722,53 +25892,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Debug" + "Build-Win-MSVC-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61776,46 +25902,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61831,53 +25941,9 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-MSVC-x86_64-Release" + "Build-Win-MSVC-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -61885,46 +25951,30 @@ "os:Windows-2016Server-14393", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All", + "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-Golo-GPU-QuadroP400-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -61940,99 +25990,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-2008ServerR2-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62048,99 +26038,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "gpu:10de:1cb3-23.21.13.9103", "os:Windows-2008ServerR2-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62156,99 +26086,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All", + "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-Win7-Clang-Golo-CPU-AVX-x86-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62264,99 +26134,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Release" + "Build-Win-Clang-x86-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62372,99 +26182,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62480,99 +26230,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62588,99 +26278,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62696,99 +26326,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-7-SP1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All", + "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-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62804,99 +26374,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Debug" + "Build-Win-Clang-x86-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 21600000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 21600000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All", + "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-Win8-Clang-Golo-CPU-AVX-x86-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -62912,99 +26422,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86-Release" + "Build-Win-Clang-x86-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All", + "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-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -63020,99 +26470,39 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Debug" + "Build-Win-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { "name": "skia/bots/skimage", "path": "skimage", "version": "version:34" @@ -63128,146 +26518,40 @@ "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Win-Clang-x86_64-Release" + "Build-Win-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ "cpu:x86-64-E5-2670", "os:Windows-8.1-SP0", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All", + "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-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63277,93 +26561,31 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All", + "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-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63373,93 +26595,31 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All", + "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-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63469,93 +26629,31 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All", + "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-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63565,93 +26663,31 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All", + "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-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Debug-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63661,93 +26697,31 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All", + "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-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Mac-Clang-arm64-Release-iOS", + "Housekeeper-PerCommit-BundleRecipes", "Housekeeper-PerCommit-IsolateSKP", "Housekeeper-PerCommit-IsolateSVG", "Housekeeper-PerCommit-IsolateSkImage" @@ -63757,92 +26731,29 @@ "os:iOS-10.3.1", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, "execution_timeout_ns": 14400000000000, "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All", + "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 }, "Upload-Build-Debian9-Clang-arm-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_skiaserve", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Build-Debian9-Clang-arm-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm-Release-Android" ], "dimensions": [ @@ -63851,86 +26762,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Build-Debian9-Clang-arm64-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_skiaserve", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Build-Debian9-Clang-arm64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Build-Debian9-Clang-arm64-Release-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-arm64-Release-Android" ], "dimensions": [ @@ -63939,86 +26788,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Build-Debian9-Clang-x64-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_skiaserve", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Build-Debian9-Clang-x64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-arm64-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Build-Debian9-Clang-x64-Release-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x64-Release-Android" ], "dimensions": [ @@ -64027,86 +26814,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Build-Debian9-Clang-x86-Release-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_skiaserve", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Build-Debian9-Clang-x86-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x64-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Build-Debian9-Clang-x86-Release-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Build-Debian9-Clang-x86-Release-Android" ], "dimensions": [ @@ -64115,91 +26840,24 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-binary-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_skiaserve", + "repository=<(REPO)", + "buildername=Build-Debian9-Clang-x86-Release-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 }, "Upload-Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_calmbench_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-calmbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -64208,91 +26866,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-calmbench-upload@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_calmbench_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-calmbench\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-calmbench" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -64301,91 +26893,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-calmbench-upload@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_calmbench_results", + "repository=<(REPO)", + "buildername=Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-calmbench" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 }, "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android" ], "dimensions": [ @@ -64394,91 +26920,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android" ], "dimensions": [ @@ -64487,91 +26947,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android" ], "dimensions": [ @@ -64580,91 +26974,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android" ], "dimensions": [ @@ -64673,91 +27001,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android" ], "dimensions": [ @@ -64766,91 +27028,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android" ], "dimensions": [ @@ -64859,91 +27055,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -64952,91 +27082,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android" ], "dimensions": [ @@ -65045,91 +27109,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android" ], "dimensions": [ @@ -65138,91 +27136,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android" ], "dimensions": [ @@ -65231,91 +27163,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android" ], "dimensions": [ @@ -65324,91 +27190,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android" ], "dimensions": [ @@ -65417,91 +27217,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan" ], "dimensions": [ @@ -65510,91 +27244,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" ], "dimensions": [ @@ -65603,91 +27271,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -65696,91 +27298,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$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_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android" ], "dimensions": [ @@ -65789,91 +27325,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android" ], "dimensions": [ @@ -65882,91 +27352,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android" ], "dimensions": [ @@ -65975,91 +27379,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan" ], "dimensions": [ @@ -66068,91 +27406,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android" ], "dimensions": [ @@ -66161,91 +27433,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench" ], "dimensions": [ @@ -66254,91 +27460,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench" ], "dimensions": [ @@ -66347,91 +27487,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -66440,91 +27514,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench" ], "dimensions": [ @@ -66533,91 +27541,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android" ], "dimensions": [ @@ -66626,91 +27568,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -66719,91 +27595,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench" ], "dimensions": [ @@ -66812,91 +27622,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench" ], "dimensions": [ @@ -66905,91 +27649,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench" ], "dimensions": [ @@ -66998,91 +27676,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All" ], "dimensions": [ @@ -67091,91 +27703,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All" ], "dimensions": [ @@ -67184,91 +27730,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All" ], "dimensions": [ @@ -67277,91 +27757,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All" ], "dimensions": [ @@ -67370,91 +27784,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All" ], "dimensions": [ @@ -67463,91 +27811,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All" ], "dimensions": [ @@ -67556,91 +27838,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All" ], "dimensions": [ @@ -67649,91 +27865,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All" ], "dimensions": [ @@ -67742,91 +27892,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -67835,91 +27919,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast" ], "dimensions": [ @@ -67928,91 +27946,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER" ], "dimensions": [ @@ -68021,91 +27973,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All" ], "dimensions": [ @@ -68114,91 +28000,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -68207,91 +28027,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" ], "dimensions": [ @@ -68300,91 +28054,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer" ], "dimensions": [ @@ -68393,91 +28081,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All" ], "dimensions": [ @@ -68486,91 +28108,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer" ], "dimensions": [ @@ -68579,91 +28135,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All" ], "dimensions": [ @@ -68672,91 +28162,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All" ], "dimensions": [ @@ -68765,91 +28189,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer" ], "dimensions": [ @@ -68858,91 +28216,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All" ], "dimensions": [ @@ -68951,91 +28243,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -69044,91 +28270,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" ], "dimensions": [ @@ -69137,91 +28297,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -69230,91 +28324,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All" ], "dimensions": [ @@ -69323,91 +28351,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All" ], "dimensions": [ @@ -69416,91 +28378,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -69509,91 +28405,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -69602,91 +28432,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All" ], "dimensions": [ @@ -69695,91 +28459,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -69788,91 +28486,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -69881,91 +28513,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All" ], "dimensions": [ @@ -69974,91 +28540,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -70067,91 +28567,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -70160,91 +28594,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -70253,91 +28621,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -70346,91 +28648,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All" ], "dimensions": [ @@ -70439,91 +28675,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -70532,91 +28702,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All" ], "dimensions": [ @@ -70625,91 +28729,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -70718,91 +28756,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -70811,91 +28783,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" ], "dimensions": [ @@ -70904,91 +28810,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -70997,91 +28837,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All" ], "dimensions": [ @@ -71090,91 +28864,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -71183,91 +28891,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -71276,91 +28918,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All" ], "dimensions": [ @@ -71369,91 +28945,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -71462,91 +28972,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -71555,91 +28999,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All" ], "dimensions": [ @@ -71648,91 +29026,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -71741,91 +29053,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -71834,91 +29080,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All" ], "dimensions": [ @@ -71927,91 +29107,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -72020,91 +29134,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -72113,91 +29161,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -72206,91 +29188,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -72299,91 +29215,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -72392,91 +29242,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -72485,91 +29269,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -72578,91 +29296,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All" ], "dimensions": [ @@ -72671,91 +29323,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All" ], "dimensions": [ @@ -72764,91 +29350,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_nano_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All" ], "dimensions": [ @@ -72857,91 +29377,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_nano_results", + "repository=<(REPO)", + "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 }, "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android" ], "dimensions": [ @@ -72950,91 +29404,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android", + "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-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android" ], "dimensions": [ @@ -73043,91 +29431,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android", + "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-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts" ], "dimensions": [ @@ -73136,91 +29458,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts", + "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android" ], "dimensions": [ @@ -73229,91 +29485,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android" ], "dimensions": [ @@ -73322,91 +29512,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android", + "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-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android" ], "dimensions": [ @@ -73415,91 +29539,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android" ], "dimensions": [ @@ -73508,91 +29566,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-All-Android", + "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-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android" ], "dimensions": [ @@ -73601,91 +29593,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android", + "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-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android" ], "dimensions": [ @@ -73694,91 +29620,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android", + "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android" ], "dimensions": [ @@ -73787,91 +29647,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-All-Android", + "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android" ], "dimensions": [ @@ -73880,91 +29674,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android" ], "dimensions": [ @@ -73973,91 +29701,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR" ], "dimensions": [ @@ -74066,91 +29728,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -74159,91 +29755,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android" ], "dimensions": [ @@ -74252,91 +29782,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android", + "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -74345,91 +29809,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android" ], "dimensions": [ @@ -74438,91 +29836,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android", + "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android" ], "dimensions": [ @@ -74531,91 +29863,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android", + "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android" ], "dimensions": [ @@ -74624,91 +29890,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android", + "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android" ], "dimensions": [ @@ -74717,91 +29917,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android" ], "dimensions": [ @@ -74810,91 +29944,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Debug-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android" ], "dimensions": [ @@ -74903,91 +29971,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android" ], "dimensions": [ @@ -74996,91 +29998,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Debug-All-Android", + "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-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android" ], "dimensions": [ @@ -75089,91 +30025,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm64-Release-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android" ], "dimensions": [ @@ -75182,91 +30052,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads" ], "dimensions": [ @@ -75275,91 +30079,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -75368,91 +30106,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads" ], "dimensions": [ @@ -75461,91 +30133,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android" ], "dimensions": [ @@ -75554,91 +30160,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads" ], "dimensions": [ @@ -75647,91 +30187,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan" ], "dimensions": [ @@ -75740,91 +30214,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads" ], "dimensions": [ @@ -75833,91 +30241,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Release-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android" ], "dimensions": [ @@ -75926,91 +30268,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads" ], "dimensions": [ @@ -76019,91 +30295,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -76112,91 +30322,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads" ], "dimensions": [ @@ -76205,91 +30349,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" ], "dimensions": [ @@ -76298,91 +30376,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts" ], "dimensions": [ @@ -76391,91 +30403,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NativeFonts", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads" ], "dimensions": [ @@ -76484,91 +30430,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_NoGPUThreads", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -76577,91 +30457,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads" ], "dimensions": [ @@ -76670,91 +30484,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$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_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_Vulkan_NoGPUThreads", + "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-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android" ], "dimensions": [ @@ -76763,91 +30511,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$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_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android", + "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-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android" ], "dimensions": [ @@ -76856,91 +30538,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android", + "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-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android" ], "dimensions": [ @@ -76949,91 +30565,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android", + "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-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android" ], "dimensions": [ @@ -77042,91 +30592,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android", + "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-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android" ], "dimensions": [ @@ -77135,91 +30619,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-All-Android", + "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-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android" ], "dimensions": [ @@ -77228,91 +30646,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android" ], "dimensions": [ @@ -77321,91 +30673,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -77414,91 +30700,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android_Vulkan", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android" ], "dimensions": [ @@ -77507,91 +30727,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android", + "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan" ], "dimensions": [ @@ -77600,91 +30754,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android" ], "dimensions": [ @@ -77693,91 +30781,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR" ], "dimensions": [ @@ -77786,91 +30808,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -77879,91 +30835,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android" ], "dimensions": [ @@ -77972,91 +30862,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android", + "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-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -78065,91 +30889,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android" ], "dimensions": [ @@ -78158,91 +30916,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan" ], "dimensions": [ @@ -78251,91 +30943,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android" ], "dimensions": [ @@ -78344,91 +30970,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android", + "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-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan" ], "dimensions": [ @@ -78437,91 +30997,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan", + "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-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All" ], "dimensions": [ @@ -78530,91 +31024,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All", + "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-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All" ], "dimensions": [ @@ -78623,91 +31051,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All", + "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-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All" ], "dimensions": [ @@ -78716,91 +31078,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Debug-All", + "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-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All" ], "dimensions": [ @@ -78809,91 +31105,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-AcerChromebook13_CB5_311-GPU-TegraK1-arm-Release-All", + "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-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All" ], "dimensions": [ @@ -78902,91 +31132,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All", + "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-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All" ], "dimensions": [ @@ -78995,91 +31159,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Release-All", + "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-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All" ], "dimensions": [ @@ -79088,91 +31186,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Debug-All", + "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-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All" ], "dimensions": [ @@ -79181,91 +31213,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-Pixelbook-GPU-IntelHDGraphics615-x86_64-Release-All", + "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-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All" ], "dimensions": [ @@ -79274,91 +31240,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Debug-All", + "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-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All" ], "dimensions": [ @@ -79367,91 +31267,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-SamsungChromebook2012-GPU-MaliT604-arm-Release-All", + "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-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All" ], "dimensions": [ @@ -79460,91 +31294,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Debug-All", + "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-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All" ], "dimensions": [ @@ -79553,91 +31321,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All", + "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-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All" ], "dimensions": [ @@ -79646,91 +31348,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All", + "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-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All" ], "dimensions": [ @@ -79739,91 +31375,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All", + "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-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All" ], "dimensions": [ @@ -79832,91 +31402,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug-All", + "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-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All" ], "dimensions": [ @@ -79925,91 +31429,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All" ], "dimensions": [ @@ -80018,91 +31456,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All" ], "dimensions": [ @@ -80111,91 +31483,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts" ], "dimensions": [ @@ -80204,91 +31510,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" ], "dimensions": [ @@ -80297,91 +31537,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack" ], "dimensions": [ @@ -80390,127 +31564,32 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" - }, - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:120" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_coverage_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage\",\"gs_bucket\":\"skia-coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_12-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_01_12-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_02_12-Coverage", @@ -80522,7 +31601,8 @@ "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_08_12-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_09_12-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_10_12-Coverage", - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_11_12-Coverage" + "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_11_12-Coverage", + "Build-Debian9-Clang-x86_64-Debug-Coverage" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -80530,91 +31610,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_coverage_results", + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-coverage" + ], + "isolate": "upload_coverage_results.isolate", + "priority": 0.8 }, "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -80623,91 +31637,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast" ], "dimensions": [ @@ -80716,91 +31664,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD" ], "dimensions": [ @@ -80809,91 +31691,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2" ], "dimensions": [ @@ -80902,91 +31718,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41" ], "dimensions": [ @@ -80995,91 +31745,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41", + "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER" ], "dimensions": [ @@ -81088,91 +31772,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER", + "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-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All" ], "dimensions": [ @@ -81181,91 +31799,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Debug-All", + "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-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All" ], "dimensions": [ @@ -81274,91 +31826,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-Clang-GCE-CPU-AVX512-x86_64-Release-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All" ], "dimensions": [ @@ -81367,91 +31853,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All" ], "dimensions": [ @@ -81460,91 +31880,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -81553,91 +31907,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All" ], "dimensions": [ @@ -81646,91 +31934,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer" ], "dimensions": [ @@ -81739,91 +31961,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" ], "dimensions": [ @@ -81832,91 +31988,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "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-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts" ], "dimensions": [ @@ -81925,91 +32015,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All" ], "dimensions": [ @@ -82018,91 +32042,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer" ], "dimensions": [ @@ -82111,91 +32069,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All" ], "dimensions": [ @@ -82204,91 +32096,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All" ], "dimensions": [ @@ -82297,91 +32123,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts" ], "dimensions": [ @@ -82390,91 +32150,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts", + "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All" ], "dimensions": [ @@ -82483,91 +32177,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All" ], "dimensions": [ @@ -82576,91 +32204,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer" ], "dimensions": [ @@ -82669,91 +32231,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer", + "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All" ], "dimensions": [ @@ -82762,91 +32258,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All" ], "dimensions": [ @@ -82855,91 +32285,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -82948,91 +32312,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All" ], "dimensions": [ @@ -83041,91 +32339,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All", + "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-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -83134,91 +32366,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All" ], "dimensions": [ @@ -83227,91 +32393,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -83320,91 +32420,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" ], "dimensions": [ @@ -83413,91 +32447,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", + "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-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -83506,91 +32474,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", + "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-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All" ], "dimensions": [ @@ -83599,91 +32501,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", + "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-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All" ], "dimensions": [ @@ -83692,91 +32528,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", + "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-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All" ], "dimensions": [ @@ -83785,91 +32555,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All", + "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-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All" ], "dimensions": [ @@ -83878,91 +32582,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All" ], "dimensions": [ @@ -83971,128 +32609,34 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" - }, - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:120" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_coverage_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Coverage\",\"gs_bucket\":\"skia-coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Coverage", - "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Coverage" + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Coverage", + "Build-Debian9-Clang-x86_64-Debug-Coverage" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -84100,91 +32644,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_coverage_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Coverage", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-coverage" + ], + "isolate": "upload_coverage_results.isolate", + "priority": 0.8 }, "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1" ], "dimensions": [ @@ -84193,91 +32671,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan" ], "dimensions": [ @@ -84286,91 +32698,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3" ], "dimensions": [ @@ -84379,91 +32725,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan" ], "dimensions": [ @@ -84472,91 +32752,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -84565,133 +32779,34 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage": { "cipd_packages": [ { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/git/${platform}", - "path": "cipd_bin_packages", - "version": "version:2.15.0.chromium12" - }, - { - "name": "infra/tools/git/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:fa7a52f4741f5e04bba0dfccc9b8456dc572c60b" - }, - { - "name": "infra/tools/luci/git-credential-luci/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - }, - { "name": "skia/bots/clang_linux", "path": "clang_linux", "version": "version:11" - }, - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:120" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - }, - { - "name": "skia/bots/linux_vulkan_sdk", - "path": "linux_vulkan_sdk", - "version": "version:0" } ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_coverage_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage\",\"gs_bucket\":\"skia-coverage\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage", - "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Vulkan_Coverage" + "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-shard_00_01-Vulkan_Coverage", + "Build-Debian9-Clang-x86_64-Debug-Vulkan_Coverage" ], "dimensions": [ "cpu:x86-64-Haswell_GCE", @@ -84699,91 +32814,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-coverage-uploade@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_coverage_results", + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-coverage" + ], + "isolate": "upload_coverage_results.isolate", + "priority": 0.8 }, "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -84792,91 +32841,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -84885,91 +32868,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All" ], "dimensions": [ @@ -84978,91 +32895,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -85071,91 +32922,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -85164,91 +32949,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All" ], "dimensions": [ @@ -85257,91 +32976,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -85350,91 +33003,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE", + "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-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -85443,91 +33030,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan", + "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-Clang-Golo-GPU-GT610-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All" ], "dimensions": [ @@ -85536,91 +33057,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All", + "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-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -85629,91 +33084,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Debug-All-ANGLE", + "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-Clang-Golo-GPU-GT610-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All" ], "dimensions": [ @@ -85722,91 +33111,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All", + "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-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -85815,91 +33138,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All" ], "dimensions": [ @@ -85908,91 +33165,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -86001,91 +33192,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -86094,91 +33219,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump" ], "dimensions": [ @@ -86187,91 +33246,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -86280,91 +33273,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -86373,91 +33300,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -86466,91 +33327,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump" ], "dimensions": [ @@ -86559,91 +33354,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump", + "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-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts" ], "dimensions": [ @@ -86652,91 +33381,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts", + "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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All" ], "dimensions": [ @@ -86745,91 +33408,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All", + "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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -86838,91 +33435,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE", + "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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All" ], "dimensions": [ @@ -86931,91 +33462,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All", + "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-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -87024,91 +33489,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All" ], "dimensions": [ @@ -87117,91 +33516,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -87210,91 +33543,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -87303,91 +33570,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All" ], "dimensions": [ @@ -87396,91 +33597,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -87489,91 +33624,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts" ], "dimensions": [ @@ -87582,91 +33651,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts", + "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-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -87675,91 +33678,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan", + "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-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All" ], "dimensions": [ @@ -87768,91 +33705,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", + "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-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -87861,91 +33732,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE", + "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-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" ], "dimensions": [ @@ -87954,91 +33759,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", + "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-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -88047,91 +33786,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All" ], "dimensions": [ @@ -88140,91 +33813,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -88233,91 +33840,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -88326,91 +33867,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All" ], "dimensions": [ @@ -88419,91 +33894,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -88512,91 +33921,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE", + "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-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -88605,91 +33948,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All" ], "dimensions": [ @@ -88698,91 +33975,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -88791,91 +34002,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-ANGLE", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -88884,91 +34029,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Debug-All-Vulkan", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All" ], "dimensions": [ @@ -88977,91 +34056,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -89070,91 +34083,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE", + "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-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -89163,91 +34110,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All" ], "dimensions": [ @@ -89256,91 +34137,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -89349,91 +34164,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -89442,91 +34191,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All" ], "dimensions": [ @@ -89535,91 +34218,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -89628,91 +34245,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE", + "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-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -89721,91 +34272,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All" ], "dimensions": [ @@ -89814,91 +34299,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE" ], "dimensions": [ @@ -89907,91 +34326,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -90000,91 +34353,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All" ], "dimensions": [ @@ -90093,91 +34380,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE" ], "dimensions": [ @@ -90186,91 +34407,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE", + "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-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -90279,91 +34434,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan", + "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-Golo-GPU-QuadroP400-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All" ], "dimensions": [ @@ -90372,91 +34461,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" ], "dimensions": [ @@ -90465,91 +34488,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", + "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-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -90558,91 +34515,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan" ], "dimensions": [ @@ -90651,91 +34542,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", + "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-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All" ], "dimensions": [ @@ -90744,91 +34569,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All" ], "dimensions": [ @@ -90837,91 +34596,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All" ], "dimensions": [ @@ -90930,91 +34623,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA" ], "dimensions": [ @@ -91023,91 +34650,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA" ], "dimensions": [ @@ -91116,91 +34677,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA" ], "dimensions": [ @@ -91209,91 +34704,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -91302,91 +34731,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA" ], "dimensions": [ @@ -91395,91 +34758,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA" ], "dimensions": [ @@ -91488,91 +34785,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA", + "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-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA" ], "dimensions": [ @@ -91581,91 +34812,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All" ], "dimensions": [ @@ -91674,91 +34839,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Debug-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All" ], "dimensions": [ @@ -91767,91 +34866,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86-Release-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All" ], "dimensions": [ @@ -91860,91 +34893,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All", + "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-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All" ], "dimensions": [ @@ -91953,91 +34920,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All", + "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-Golo-GPU-QuadroP400-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All" ], "dimensions": [ @@ -92046,91 +34947,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", + "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-Golo-GPU-QuadroP400-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All" ], "dimensions": [ @@ -92139,91 +34974,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", + "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-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All" ], "dimensions": [ @@ -92232,91 +35001,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All", + "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-Win7-Clang-Golo-CPU-AVX-x86-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All" ], "dimensions": [ @@ -92325,91 +35028,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All" ], "dimensions": [ @@ -92418,91 +35055,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts" ], "dimensions": [ @@ -92511,91 +35082,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI" ], "dimensions": [ @@ -92604,91 +35109,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI", + "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-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All" ], "dimensions": [ @@ -92697,91 +35136,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All", + "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-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All" ], "dimensions": [ @@ -92790,91 +35163,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All", + "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-Win8-Clang-Golo-CPU-AVX-x86-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All" ], "dimensions": [ @@ -92883,91 +35190,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All", + "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-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All" ], "dimensions": [ @@ -92976,91 +35217,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All", + "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-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All" ], "dimensions": [ @@ -93069,91 +35244,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All", + "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-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All" ], "dimensions": [ @@ -93162,91 +35271,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All", + "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-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All" ], "dimensions": [ @@ -93255,91 +35298,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All", + "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-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All" ], "dimensions": [ @@ -93348,91 +35325,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All", + "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-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All" ], "dimensions": [ @@ -93441,91 +35352,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All", + "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-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All" ], "dimensions": [ @@ -93534,91 +35379,25 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, - "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:206b4474cb712bdad8b7b3f213880cfbf03f120c" - }, - { - "name": "infra/tools/authutil/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:9c63809842a277ce10a86afd51b61c639a665d11" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:d0130097bd6364a8d834cb9efd4554c1f6192c82" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "pdfium.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", + "extra_args": [ + "--workdir", + "../../..", "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All", + "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-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All": { "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All" ], "dimensions": [ @@ -93627,21 +35406,22 @@ "os:Debian-9.4", "pool:Skia" ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "isolate": "swarm_recipe.isolate", - "priority": 0.8, - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All", + "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 } } } |