diff options
author | 2017-04-28 18:59:04 -0700 | |
---|---|---|
committer | 2017-05-02 19:50:11 +0000 | |
commit | 74be2f20950459c957a923ccadea2158c88cad50 (patch) | |
tree | 3dc4b6bd36167fe16ed90080cf17c8e8734b4e57 /infra/bots/recipes | |
parent | a754378ef659dcc0bca9179719123e32891fb605 (diff) |
Manually roll skia recipe deps.
This includes:
recipes-py: 554e8878ac6395262dc3c90bbb8a100ee844f766">https://chromium.googlesource.com/external/github.com/luci/recipes-py/+log/f5e47cfc28b5964701572db12f96c7a5a3f1821a..554e8878ac6395262dc3c90bbb8a100ee844f766
depot_tools: 1e71b8bdf0913b306b28141192272350cf68cdc2">https://chromium.googlesource.com/chromium/tools/depot_tools/+log/109907e6a95ae0301b1564c76c4a3e9d15e19366..1e71b8bdf0913b306b28141192272350cf68cdc2
tools/build: dcca7cbe7ecda2c4d511f38c6f3eab29cad08cf7">https://chromium.googlesource.com/chromium/tools/build/+log/f7b41106d64b6517c67343f2cfb03f4a9d62afc2..dcca7cbe7ecda2c4d511f38c6f3eab29cad08cf7
The ranges include my generic postprocess/merge change in tools/build
that had been failing to roll over in https://skia-review.googlesource.com/c/13920/
along with a few corresponding fixes.
Change-Id: I7e328bdb3acfc9b4c219e408c226f181f3b05f3d
Reviewed-on: https://skia-review.googlesource.com/14678
Commit-Queue: John Budorick <jbudorick@chromium.org>
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes')
60 files changed, 1260 insertions, 240 deletions
diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json index 7d4fde94ea..0c64209d78 100644 --- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json +++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index f6b7ec6bc9..de0491fa5f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 5caab67d73..fc157960aa 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index b6f31741e7..836039968d 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 82cc3dfd5e..01448db110 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -135,7 +135,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index e7f552a6a5..fa51509c34 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json index b9fff8cd12..3a3dff7026 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json index 2f07fd8fbb..9ea88d019b 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json index eed82fa147..348c3fa035 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json index 9a117f74cd..151a4a5ea2 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json index fe5b8b5abc..32b843457f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 6332f9d22c..5e93313935 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json index ddbda37c96..23c6d82c53 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json index ee8c14d817..a21c0e6b7d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index c4e8c46d4e..fcaeda5fbb 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index e90051d76e..95c08e8ca3 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 269555afc5..d90849f24f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json index 4fd8f213c2..177d5c268d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 91e46c5540..6ee1c48e82 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index b75f7dbf03..b48f081a64 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 5b85568dff..9a6bfaddc3 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 73181c3f0e..822c9ba510 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index 567c94fa88..4b14700202 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 68550c3289..57f56d7919 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 59c05fd800..20c4f12cc2 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -92,7 +92,7 @@ "--patch_root", "src/third_party/skia", "--revision_mapping_file", - "{\"src/flutter\": \"got_flutter_revision\", \"src/third_party/skia\": \"got_revision\"}", + "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 7d68603bfd..71303301ae 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 73ff1102d8..bb107e0b3b 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -92,7 +92,7 @@ "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", - "{\"pdfium\": \"got_pdfium_revision\", \"pdfium/third_party/skia\": \"got_revision\"}", + "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index 2cbbcc670e..650ba2b74d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -92,7 +92,7 @@ "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", - "{\"pdfium\": \"got_pdfium_revision\", \"pdfium/third_party/skia\": \"got_revision\"}", + "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 3c43fb1362..7e2dc9c82a 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index c56e92a224..673070dc2d 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 91dfc37f04..f20de10b80 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index a0c48d84b7..610153fc74 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index b354814737..dc47399b4f 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 33146e86f2..44b951f03c 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json index ff6c279f07..c882f63719 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index b7354506ab..f8ac39940b 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index ddba2f0092..30e7ce0159 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -92,7 +92,7 @@ "--patch_root", "other_repo", "--revision_mapping_file", - "{\"other_repo\": \"got_revision\"}", + "{\"got_revision\": \"other_repo\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index d9d86a2655..209aaa79ed 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -92,7 +92,7 @@ "--patch_root", "src/third_party/skia", "--revision_mapping_file", - "{\"src/flutter\": \"got_flutter_revision\", \"src/third_party/skia\": \"got_revision\"}", + "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index 821988490a..5c6edbc0b5 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -92,7 +92,7 @@ "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", - "{\"pdfium\": \"got_pdfium_revision\", \"pdfium/third_party/skia\": \"got_revision\"}", + "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 470439e376..db00b4e8ff 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_C:\\_B_CACHE]", "--gerrit_repo", diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 1bd123f4d0..57d1cac947 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1405,6 +1422,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1414,13 +1447,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1539,6 +1573,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1548,13 +1598,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1673,6 +1724,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1682,13 +1749,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1807,6 +1875,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1816,13 +1900,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index e328227446..368c8ddf7f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,13 +1460,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1466,6 +1517,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1475,13 +1542,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1531,6 +1599,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1540,13 +1624,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index eda0511185..d571e49647 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,13 +1460,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1466,6 +1517,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1475,13 +1542,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1531,6 +1599,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1540,13 +1624,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 38d53aea79..15d4d36e40 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", @@ -1295,6 +1295,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1304,13 +1320,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1360,6 +1377,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1369,13 +1402,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1425,6 +1459,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1434,13 +1484,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1490,6 +1541,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1499,13 +1566,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1555,6 +1623,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1564,13 +1648,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index f49c40e7f0..43061be38f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,13 +1460,14 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1466,6 +1517,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1475,13 +1542,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1531,6 +1599,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1540,13 +1624,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index cc399d0807..d05b3fe497 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,14 +1296,15 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1340,6 +1357,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1349,13 +1382,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1405,6 +1439,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1414,14 +1464,15 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1474,6 +1525,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1483,13 +1550,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1539,6 +1607,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1548,13 +1632,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 718176690a..63e60bfc33 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,14 +1460,15 @@ "--json", "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-3", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1470,6 +1521,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1479,13 +1546,14 @@ "--json", "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1535,6 +1603,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1544,13 +1628,14 @@ "--json", "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-dm-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 51c4f5af1c..0733d60558 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1286,6 +1286,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1295,13 +1311,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1420,6 +1437,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1429,13 +1462,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1554,6 +1588,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1563,13 +1613,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1688,6 +1739,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1697,13 +1764,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1822,6 +1890,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1831,13 +1915,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 6a3db874cc..8f23446eeb 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1286,6 +1286,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1295,13 +1311,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-1/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1420,6 +1437,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1429,13 +1462,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-2/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1554,6 +1588,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1563,13 +1613,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-3/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1688,6 +1739,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1697,13 +1764,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-4/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1822,6 +1890,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1831,13 +1915,14 @@ "--json", "{\"base_task_name\": \"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\", \"tasks\": {\"ct-nanobench-5/Ubuntu-14.04/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-nanobench-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index 22b7ce7dd6..5c9af4d047 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,13 +1460,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1466,6 +1517,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1475,13 +1542,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1531,6 +1599,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1540,13 +1624,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index a3988ab5e9..42a5ad1f17 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", @@ -1271,6 +1271,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1280,13 +1296,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1336,6 +1353,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1345,13 +1378,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1401,6 +1435,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1410,13 +1460,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1466,6 +1517,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1475,13 +1542,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1531,6 +1599,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1540,13 +1624,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/-1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 21bc5128bf..1c1a04bb7a 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", @@ -1305,6 +1305,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1314,13 +1330,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-1", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1370,6 +1387,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1379,13 +1412,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-2", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1435,6 +1469,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1444,13 +1494,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-3", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1500,6 +1551,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1509,13 +1576,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-4", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", @@ -1565,6 +1633,22 @@ "cmd": [ "python", "-u", + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", + "--show-path", + "--", + "python", + "RECIPE_MODULE[build::swarming]/resources/collect_task.py", + "-o", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5", + "--merge-script", + "RECIPE_MODULE[build::swarming]/resources/noop_merge.py", + "--merge-additional-args", + "[]", + "--", + "python", + "-u", "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", @@ -1574,13 +1658,14 @@ "--json", "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", - "/path/to/tmp/json", - "--task-output-dir", - "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "/path/to/tmp/json" ], + "cwd": "[START_DIR]", "name": "ct-get_images_from_skps-5", "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@json.output@{}@@@", + "@@@STEP_LOG_END@json.output@@@", "@@@STEP_LOG_LINE@swarming.summary@{@@@", "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", "@@@STEP_LOG_LINE@swarming.summary@ {@@@", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 74783498cb..a458c79c35 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index 46c1da2637..f89867508d 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index f835a0769d..f773abae1c 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index cdfe925622..1610f9d72b 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index 3b433f72bd..cf85d2b78a 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -92,7 +92,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index f36b3cdfd0..e707425478 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -135,7 +135,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 1ed75f1409..db3022ccd1 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -135,7 +135,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 5ab4fc3767..ffa2e45995 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -135,7 +135,7 @@ "--patch_root", "skia", "--revision_mapping_file", - "{\"skia\": \"got_revision\"}", + "{\"got_revision\": \"skia\"}", "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--output_json", |