diff options
| author |  Eric Boren <borenet@google.com> | 2017-03-20 15:40:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 11:07:41 +0000 |
| commit | 53262d0ff466668bfbc76893ba5a581203269572 (patch) | |
| tree | 873d85cee029724dc7db242d47e346baa25fca91 | |
| parent | 3130fbb1a7aa60ac764f5ccb64a1a0ee976ea127 (diff) | |
Roll Recipe DEPS
BUG=skia:
Change-Id: Ic89d1b49aba842fb41c82ad6fc8f5ebe787893bd
Reviewed-on: https://skia-review.googlesource.com/9884
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
144 files changed, 279 insertions, 1188 deletions
diff --git a/infra/bots/recipe_modules/compile/__init__.py b/infra/bots/recipe_modules/compile/__init__.py index 219eff548d..0021aeae42 100644 --- a/infra/bots/recipe_modules/compile/__init__.py +++ b/infra/bots/recipe_modules/compile/__init__.py @@ -9,6 +9,7 @@ DEPS = [ 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/python', + 'recipe_engine/step', 'flavor', 'run', 'vars', diff --git a/infra/bots/recipe_modules/compile/api.py b/infra/bots/recipe_modules/compile/api.py index a74131fd63..917b228401 100644 --- a/infra/bots/recipe_modules/compile/api.py +++ b/infra/bots/recipe_modules/compile/api.py @@ -39,7 +39,8 @@ class CompileApi(recipe_api.RecipeApi): try: for target in build_targets: - self.m.flavor.compile(target, env=env) + with self.m.step.context({'env': env}): + self.m.flavor.compile(target) self.m.run.copy_build_products( self.m.flavor.out_dir, self.m.vars.swarming_out_dir.join( diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 4df52ed7e5..21c42fb346 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json index b2070c4f13..acc3651e73 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json @@ -87,7 +87,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -101,7 +102,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -113,7 +115,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index aea8d90df1..18661405d1 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -109,12 +109,8 @@ "--make-output-dir" ], "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "build command_buffer" }, @@ -127,9 +123,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, @@ -146,9 +142,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, @@ -163,9 +159,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json index 8e78afa84b..c66ac778f2 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index e38e74cc17..fa05bde932 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -93,7 +93,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -107,7 +108,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -119,7 +121,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json index dfac9b5d78..ea838cd1f6 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json @@ -87,7 +87,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -101,7 +102,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -113,7 +115,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json index 5b89607c2a..34e8f5c15d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json @@ -87,7 +87,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -101,7 +102,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -113,7 +115,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json index 8c4c421360..6b6dc16fe2 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json @@ -87,7 +87,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -101,7 +102,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -113,7 +115,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index f497cbe620..c163c0408f 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index baf77b92ff..fa243d5ba7 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index fc11686d2e..6a30ea1412 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Mini" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 4c425cc822..234bcfec18 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index efc5f19fa6..4f42cebab6 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -86,9 +86,6 @@ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" - }, "infra_step": true, "name": "fetch-gn" }, @@ -100,9 +97,6 @@ "--args=ar=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-ar\" cc=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-gcc\" cxx=\"[START_DIR]/cast_toolchain/bin/armv7a-cros-linux-gnueabi-g++\" extra_cflags=[\"-g0\"] extra_ldflags=[\"-static-libstdc++\", \"-static-libgcc\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_icu=false skia_use_system_freetype2=false target_cpu=\"arm\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" - }, "name": "gn gen" }, { @@ -113,9 +107,6 @@ "nanobench" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" - }, "name": "ninja" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json index 1844048c8d..323d9b12ed 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 3aeb6eed5a..867f3c7e8d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 0e1fd486d8..3aadc37d11 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 821300b7f7..b0c6196f75 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 01a47bbabb..235b86c3c0 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -89,8 +89,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, @@ -108,8 +107,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, @@ -125,8 +123,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index ada9a8b0f1..739fb13a24 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index ff0a703265..52d763c7a4 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index e7253fbc41..2d9113075e 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -96,14 +96,6 @@ "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "runhook" }, { @@ -126,15 +118,6 @@ "--runtime-mode=release", "--android" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "gn_gen" }, { @@ -144,15 +127,6 @@ "out/android_release", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "build_flutter" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 2cae1228ba..13302126ce 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index b46fff962a..4ea7fa1fb8 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -97,14 +97,6 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, "name": "runhook" }, { @@ -114,14 +106,6 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, "name": "sysroot" }, { @@ -133,13 +117,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "gn_gen" }, @@ -152,13 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index 89c7bfa653..0fce3fbe5c 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -97,14 +97,6 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" - }, "name": "runhook" }, { @@ -114,14 +106,6 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" - }, "name": "sysroot" }, { @@ -133,13 +117,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "gn_gen" }, @@ -152,13 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 3cceaf0a5a..705b0b3da4 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index 6a27576a38..394db6d34d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json index 62cc2c45fb..194fb43e34 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-Clang-arm64-Release-GN_Android.json @@ -87,7 +87,8 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "infra_step": true, "name": "fetch-gn" @@ -101,7 +102,8 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "gn gen" }, @@ -113,7 +115,8 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 5e09aa153c..173ff9f17e 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index fd5eb68344..2a93115b1a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json index dbd7b32844..ba32bc6c00 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json index bb1e381fe8..d1f8dc12c9 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json index b99ad3c65d..4233a6e9c5 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index c682fdc025..a5cc98d586 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json index 6a0ea18c89..923f3de07f 100644 --- a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json +++ b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json @@ -89,8 +89,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, @@ -108,8 +106,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, @@ -125,8 +121,6 @@ "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json index e0fd84b8eb..77b7b53622 100644 --- a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json @@ -95,8 +95,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -114,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -131,8 +127,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json index d72b6aaec7..c7197d15ab 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json @@ -116,8 +116,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -135,8 +133,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -152,8 +148,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json index 1d91dc282c..7bb68d2b22 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json @@ -118,8 +118,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -137,8 +135,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, @@ -154,8 +150,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json index 4e818f4c52..e6aebf3e78 100644 --- a/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/flutter_trybot.json @@ -100,14 +100,6 @@ "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "runhook" }, { @@ -130,15 +122,6 @@ "--runtime-mode=release", "--android" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "gn_gen" }, { @@ -148,15 +131,6 @@ "out/android_release", "-j100" ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android" - }, "name": "build_flutter" }, { diff --git a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json index ed61ad03d1..1899d01efd 100644 --- a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json @@ -101,14 +101,6 @@ "gn_linux64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, "name": "runhook" }, { @@ -118,14 +110,6 @@ "--arch=amd64" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, "name": "sysroot" }, { @@ -137,13 +121,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "gn_gen" }, @@ -156,13 +134,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json index 16ac8962d2..79257cc00b 100644 --- a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json @@ -116,8 +116,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, @@ -135,8 +133,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, @@ -152,8 +148,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index 1c4554d8d5..5df07e2e06 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -142,8 +142,6 @@ class SkiaApi(recipe_api.RecipeApi): self.update_repo(self.m.vars.checkout_root, chromium) # Run bot_update. - checkout_kwargs = {} - checkout_kwargs['env'] = self.m.vars.default_env # Hack the patch ref if necessary. if self.m.properties.get('patch_storage', '') == 'gerrit': @@ -155,14 +153,14 @@ class SkiaApi(recipe_api.RecipeApi): ) self.m.gclient.c = gclient_cfg - with self.m.step.context({'cwd': self.m.vars.checkout_root}): - update_step = self.m.bot_update.ensure_checkout( - patch_root=patch_root, - **checkout_kwargs) + with self.m.step.context({'cwd': self.m.vars.checkout_root, + 'env': self.m.vars.default_env}): + update_step = self.m.bot_update.ensure_checkout(patch_root=patch_root) self.m.vars.got_revision = ( update_step.presentation.properties['got_revision']) if self.m.vars.need_chromium_checkout: - with self.m.step.context({'cwd': self.m.vars.checkout_root}): - self.m.gclient.runhooks(env=self.m.vars.gclient_env) + with self.m.step.context({'cwd': self.m.vars.checkout_root, + 'env': self.m.vars.gclient_env}): + self.m.gclient.runhooks() diff --git a/infra/bots/recipe_modules/flavor/__init__.py b/infra/bots/recipe_modules/flavor/__init__.py index cbaa76e909..408819d716 100644 --- a/infra/bots/recipe_modules/flavor/__init__.py +++ b/infra/bots/recipe_modules/flavor/__init__.py @@ -6,6 +6,7 @@ DEPS = [ 'build/adb', 'build/file', 'builder_name_schema', + 'depot_tools/bot_update', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index eadaea024c..3f3e1363f7 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -71,8 +71,8 @@ class SkiaFlavorApi(recipe_api.RecipeApi): def step(self, name, cmd, **kwargs): return self._f.step(name, cmd, **kwargs) - def compile(self, target, **kwargs): - return self._f.compile(target, **kwargs) + def compile(self, target): + return self._f.compile(target) def copy_extra_build_products(self, swarming_out_dir): return self._f.copy_extra_build_products(swarming_out_dir) diff --git a/infra/bots/recipe_modules/flavor/flutter_flavor.py b/infra/bots/recipe_modules/flavor/flutter_flavor.py index a4b1e79440..be3a9f0962 100644 --- a/infra/bots/recipe_modules/flavor/flutter_flavor.py +++ b/infra/bots/recipe_modules/flavor/flutter_flavor.py @@ -12,7 +12,7 @@ import default_flavor class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils): - def compile(self, target, **kwargs): + def compile(self, target): """Build Flutter with Skia.""" flutter_dir = self.m.vars.checkout_root.join('src') @@ -20,13 +20,13 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils): extra_config = self.m.vars.builder_cfg.get('extra_config', '') out_dir = configuration - # Runhook to generate the gn binary in buildtools. - self.m.run( - self.m.step, - 'runhook', - cmd=['gclient', 'runhooks'], - cwd=flutter_dir, - **kwargs) + with self.m.step.context({'cwd': flutter_dir}): + + # Runhook to generate the gn binary in buildtools. + self.m.run( + self.m.step, + 'runhook', + cmd=['gclient', 'runhooks']) # Setup GN args. gn_args = [ @@ -43,14 +43,10 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils): self.m.run( self.m.step, 'gn_gen', - cmd=['flutter/tools/gn'] + gn_args, - cwd=flutter_dir, - **kwargs) + cmd=['flutter/tools/gn'] + gn_args) # Build Flutter. self.m.run( self.m.step, 'build_flutter', - cmd=['ninja', '-C', 'out/' + out_dir, '-j100'], - cwd=flutter_dir, - **kwargs) + cmd=['ninja', '-C', 'out/' + out_dir, '-j100']) diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 05a6da25ff..ce57ab6df2 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -30,13 +30,14 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): def _run(self, title, *cmd, **kwargs): self._strip_environment() - return self.m.run(self.m.step, title, cmd=list(cmd), - cwd=self.m.vars.skia_dir, **kwargs) + with self.m.step.context({'cwd': self.m.vars.skia_dir}): + return self.m.run(self.m.step, title, cmd=list(cmd), **kwargs) def _py(self, title, script, infra_step=True): self._strip_environment() - return self.m.run(self.m.python, title, script=script, - cwd=self.m.vars.skia_dir, env=None, infra_step=infra_step) + with self.m.step.context({'cwd': self.m.vars.skia_dir}): + return self.m.run(self.m.python, title, script=script, + infra_step=infra_step) def _adb(self, title, *cmd, **kwargs): self._ever_ran_adb = True @@ -81,7 +82,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): infra_step=True) - def compile(self, unused_target, **kwargs): + def compile(self, unused_target): compiler = self.m.vars.builder_cfg.get('compiler') configuration = self.m.vars.builder_cfg.get('configuration') extra_config = self.m.vars.builder_cfg.get('extra_config', '') @@ -169,7 +170,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): if self._ever_ran_adb: self._adb('kill adb server', 'kill-server') - def step(self, name, cmd, env=None, **kwargs): + def step(self, name, cmd, **kwargs): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) self._adb('push %s' % cmd[0], 'push', app, self.m.vars.android_bin_dir) @@ -218,7 +219,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): subprocess.check_call(['adb', 'push', os.path.realpath(os.path.join(host, p, f)), os.path.join(device, p, f)]) - """, args=[host, device], cwd=self.m.vars.skia_dir, infra_step=True) + """, args=[host, device], infra_step=True) def copy_directory_contents_to_host(self, device, host): self._adb('pull %s %s' % (device, host), 'pull', device, host) diff --git a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py index e8e516d818..99f35b3d7d 100644 --- a/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_chromecast_flavor.py @@ -14,7 +14,7 @@ class GNChromecastFlavorUtils(gn_android_flavor.GNAndroidFlavorUtils): def __init__(self, m): super(GNChromecastFlavorUtils, self).__init__(m) - def compile(self, unused_target, **kwargs): + def compile(self, unused_target): configuration = self.m.vars.builder_cfg.get('configuration') os = self.m.vars.builder_cfg.get('os') target_arch = self.m.vars.builder_cfg.get('target_arch') diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 590f0d1799..6040447521 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -6,13 +6,13 @@ import default_flavor """GN flavor utils, used for building Skia with GN.""" class GNFlavorUtils(default_flavor.DefaultFlavorUtils): - def _run(self, title, cmd, env=None, infra_step=False): + def _run(self, title, cmd, infra_step=False): self.m.run(self.m.step, title, cmd=cmd, - env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step) + infra_step=infra_step) - def _py(self, title, script, env=None, infra_step=True, args=()): + def _py(self, title, script, infra_step=True, args=()): self.m.run(self.m.python, title, script=script, args=args, - env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step) + infra_step=infra_step) def build_command_buffer(self): self.m.run(self.m.python, 'build command_buffer', @@ -22,7 +22,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): '--output-dir', self.m.vars.skia_out.join(self.m.vars.configuration), '--no-sync', '--make-output-dir']) - def compile(self, unused_target, **kwargs): + def compile(self, unused_target): """Build Skia with GN.""" compiler = self.m.vars.builder_cfg.get('compiler', '') configuration = self.m.vars.builder_cfg.get('configuration', '') @@ -124,9 +124,16 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): ninja = 'ninja.exe' if 'Win' in os else 'ninja' gn = self.m.vars.skia_dir.join('bin', gn) - self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) - self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) - self._run('ninja', [ninja, '-C', self.out_dir]) + env = self.m.step.get_from_context('env', {}) + env.update(self.m.vars.default_env) + env['PATH'] = self.m.path.pathsep.join([ + env.get('PATH', '%(PATH)s'), + str(self.m.bot_update._module.PACKAGE_REPO_ROOT), + ]) + with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}): + self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) + self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) + self._run('ninja', [ninja, '-C', self.out_dir]) def copy_extra_build_products(self, swarming_out_dir): configuration = self.m.vars.builder_cfg.get('configuration', '') @@ -139,10 +146,10 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): win_vulkan_sdk, swarming_out_dir.join('out', configuration + '_x64')) - def step(self, name, cmd, env=None, **kwargs): + def step(self, name, cmd): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) cmd = [app] + cmd[1:] - env = env or {} + env = self.m.step.get_from_context('env') or {} clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) extra_config = self.m.vars.builder_cfg.get('extra_config', '') @@ -167,12 +174,13 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): # Convert path objects or placeholders into strings such that they can # be passed to symbolize_stack_trace.py args = [self.m.vars.slave_dir] + [str(x) for x in cmd] - self._py('symbolized %s' % name, - self.m.vars.infrabots_dir.join('recipe_modules', 'core', - 'resources', 'symbolize_stack_trace.py'), - args=args, - env=env, - infra_step=False) + with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}): + self._py('symbolized %s' % name, + self.m.vars.infrabots_dir.join('recipe_modules', 'core', + 'resources', 'symbolize_stack_trace.py'), + args=args, + infra_step=False) else: - self._run(name, cmd, env=env) + with self.m.step.context({'env': env}): + self._run(name, cmd) diff --git a/infra/bots/recipe_modules/flavor/pdfium_flavor.py b/infra/bots/recipe_modules/flavor/pdfium_flavor.py index 3482560841..141b126431 100644 --- a/infra/bots/recipe_modules/flavor/pdfium_flavor.py +++ b/infra/bots/recipe_modules/flavor/pdfium_flavor.py @@ -12,53 +12,47 @@ import default_flavor class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils): - def compile(self, target, **kwargs): + def compile(self, target): """Build PDFium with Skia.""" pdfium_dir = self.m.vars.checkout_root.join('pdfium') # Runhook to generate the gn binary in buildtools. - self.m.run( - self.m.step, - 'runhook', - cmd=['gclient', 'runhook', 'gn_linux64'], - cwd=pdfium_dir, - **kwargs) - - # Install the sysroot. - self.m.run( - self.m.step, - 'sysroot', - cmd=['python', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=amd64'], - cwd=pdfium_dir) - - # Setup gn args. - gn_args = [ - 'pdf_is_standalone=true', - 'clang_use_chrome_plugins=false', - 'is_component_build=false', - 'is_debug=false', - ] - if 'SkiaPaths' in self.m.vars.builder_name: - gn_args.append('pdf_use_skia_paths=true') - else: - gn_args.append('pdf_use_skia=true') - - - env = kwargs.pop('env', {}) - env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools')) - self.m.run( - self.m.step, - 'gn_gen', - cmd=['gn', 'gen', 'out/skia', '--args=%s' % ' '.join(gn_args)], - cwd=pdfium_dir, - env=env) - - # Build PDFium. - self.m.run( - self.m.step, - 'build_pdfium', - cmd=['ninja', '-C', 'out/skia', '-j100'], - cwd=pdfium_dir, - env=env, - **kwargs) + with self.m.step.context({'cwd': pdfium_dir}): + self.m.run( + self.m.step, + 'runhook', + cmd=['gclient', 'runhook', 'gn_linux64']) + + # Install the sysroot. + self.m.run( + self.m.step, + 'sysroot', + cmd=['python', 'build/linux/sysroot_scripts/install-sysroot.py', + '--arch=amd64']) + + # Setup gn args. + gn_args = [ + 'pdf_is_standalone=true', + 'clang_use_chrome_plugins=false', + 'is_component_build=false', + 'is_debug=false', + ] + if 'SkiaPaths' in self.m.vars.builder_name: + gn_args.append('pdf_use_skia_paths=true') + else: + gn_args.append('pdf_use_skia=true') + + + env = self.m.step.get_from_context('env') or {} + env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools')) + with self.m.step.context({'env': env}): + self.m.run( + self.m.step, + 'gn_gen', + cmd=['gn', 'gen', 'out/skia', '--args=%s' % ' '.join(gn_args)]) + + # Build PDFium. + self.m.run( + self.m.step, + 'build_pdfium', + cmd=['ninja', '-C', 'out/skia', '-j100']) diff --git a/infra/bots/recipe_modules/infra/api.py b/infra/bots/recipe_modules/infra/api.py index 7a4d7b21ac..bdb23be224 100644 --- a/infra/bots/recipe_modules/infra/api.py +++ b/infra/bots/recipe_modules/infra/api.py @@ -24,9 +24,11 @@ class InfraApi(recipe_api.RecipeApi): This fails flakily sometimes, so perform multiple attempts. """ - self.m.run.with_retry( - self.m.step, - 'update go pkgs', - UPDATE_GO_ATTEMPTS, - cmd=['go', 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG], - env=self.go_env) + env = self.m.step.get_from_context('env') or {} + env.update(self.go_env) + with self.m.step.context({'env': env}): + self.m.run.with_retry( + self.m.step, + 'update go pkgs', + UPDATE_GO_ATTEMPTS, + cmd=['go', 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG]) diff --git a/infra/bots/recipe_modules/infra/example.py b/infra/bots/recipe_modules/infra/example.py index 8463da6c58..f243c1b565 100644 --- a/infra/bots/recipe_modules/infra/example.py +++ b/infra/bots/recipe_modules/infra/example.py @@ -25,10 +25,8 @@ def RunSteps(api): # Run the infra tests. infra_tests = api.vars.skia_dir.join( 'infra', 'bots', 'infra_tests.py') - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('infra_tests', - cmd=['python', infra_tests], - env=api.infra.go_env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': api.infra.go_env}): + api.step('infra_tests', cmd=['python', infra_tests]) def GenTests(api): diff --git a/infra/bots/recipe_modules/perf/__init__.py b/infra/bots/recipe_modules/perf/__init__.py index 10649df617..97846cab3a 100644 --- a/infra/bots/recipe_modules/perf/__init__.py +++ b/infra/bots/recipe_modules/perf/__init__.py @@ -10,6 +10,7 @@ DEPS = [ 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/raw_io', + 'recipe_engine/step', 'recipe_engine/time', 'run', 'flavor', diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index 41e438461c..d7e06a170e 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -224,9 +224,9 @@ def perf_steps(api): if '_AbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): args.extend(['--abandonGpuContext', '--nocpu']) - api.run(api.flavor.step, target, cmd=args, - abort_on_failure=False, - env=env) + with api.step.context({'env': env}): + api.run(api.flavor.step, target, cmd=args, + abort_on_failure=False) # Copy results to swarming out dir. if api.vars.upload_perf_results: diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json index c812c8372e..a9c3897008 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json index bee5a170f3..70bf858f1e 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json index ed96881268..b149caf085 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json index a595fe1f95..262df6d10a 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json index 76037e26db..f8a52b0f54 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json index b6dfb855d9..83400b5f36 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json index 4c3047f36a..57a9c20243 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json index 43fb6e6b10..ce0f41b930 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 276f897f48..d49bf89ac7 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -174,7 +174,6 @@ "os", "Mac" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 756790c63c..915fe648c0 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -108,7 +108,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 982a7cd2df..3f106bf38c 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -114,7 +114,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 8a77d3f039..564470936c 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -171,7 +171,6 @@ "os", "Win" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json index a4163bd86d..df09733fd2 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -177,7 +177,6 @@ "os", "Win10" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index e24e762883..2b4d99a44c 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -117,7 +117,6 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index c6c558c775..72ea825217 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -179,7 +179,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index c7d31a8d5c..c4bd59ebf6 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -5,12 +5,6 @@ "[START_DIR]/skia/resources", "resources" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skia/resources" }, { @@ -40,12 +34,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -54,12 +42,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SKP_VERSION" }, { @@ -67,12 +49,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm skps" }, { @@ -80,12 +56,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir skps" }, { @@ -94,12 +64,6 @@ "[START_DIR]/skp", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skp" }, { @@ -108,12 +72,6 @@ "[START_DIR]/tmp/SKP_VERSION", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SKP_VERSION" }, { @@ -143,12 +101,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -157,12 +109,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SK_IMAGE_VERSION" }, { @@ -170,12 +116,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm images" }, { @@ -183,12 +123,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir images" }, { @@ -197,12 +131,6 @@ "[START_DIR]/skimage", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skimage" }, { @@ -211,12 +139,6 @@ "[START_DIR]/tmp/SK_IMAGE_VERSION", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" }, { @@ -246,12 +168,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -260,12 +176,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SVG_VERSION" }, { @@ -273,12 +183,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm svgs" }, { @@ -286,12 +190,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir svgs" }, { @@ -300,12 +198,6 @@ "[START_DIR]/svg", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/svg" }, { @@ -314,12 +206,6 @@ "[START_DIR]/tmp/SVG_VERSION", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { @@ -327,12 +213,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "perf" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm perf" }, { @@ -340,12 +220,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "perf" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir perf" }, { @@ -355,7 +229,6 @@ "[START_DIR]/skia/gn/package_ios.py", "[START_DIR]/out/Release/nanobench" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -374,7 +247,6 @@ "--args", "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -411,12 +283,6 @@ "perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.nanobench", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "pull_if_needed perf" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json index e16db8a4c9..eb2bed968d 100644 --- a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json @@ -179,7 +179,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/perf/example.expected/failed_push.json b/infra/bots/recipe_modules/perf/example.expected/failed_push.json index 8bc41ecfac..5f7f94feeb 100644 --- a/infra/bots/recipe_modules/perf/example.expected/failed_push.json +++ b/infra/bots/recipe_modules/perf/example.expected/failed_push.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json index 9e30c66d23..6cb6ce2f77 100644 --- a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json @@ -213,7 +213,6 @@ "os", "Win8" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 48a6d1f86c..61f4f0742b 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -68,29 +68,21 @@ class SkiaStepApi(recipe_api.RecipeApi): def rmtree(self, path): """Wrapper around api.file.rmtree with environment fix.""" - env = {} + env = self.m.step.get_from_context('env') or {} env['PYTHONPATH'] = str(self.m.path['start_dir'].join( 'skia', 'infra', 'bots', '.recipe_deps', 'build', 'scripts')) - self.m.file.rmtree(self.m.path.basename(path), - path, - env=env, - infra_step=True) - - def _run(self, steptype, **kwargs): - """Wrapper for running a step.""" - cwd = kwargs.pop('cwd', None) - if cwd: - with self.m.step.context({'cwd': cwd}): - return steptype(**kwargs) - return steptype(**kwargs) + with self.m.step.context({'env': env}): + self.m.file.rmtree(self.m.path.basename(path), + path, + infra_step=True) def __call__(self, steptype, name, abort_on_failure=True, - fail_build_on_failure=True, env=None, **kwargs): + fail_build_on_failure=True, **kwargs): """Run a step. If it fails, keep going but mark the build status failed.""" - env = env or {} + env = self.m.step.get_from_context('env') or {} env.update(self.m.vars.default_env) try: - return self._run(steptype, name=name, env=env, **kwargs) + return steptype(name=name, **kwargs) except self.m.step.StepFailure as e: if abort_on_failure or fail_build_on_failure: self._failed.append(e) @@ -135,7 +127,7 @@ for pattern in build_products_whitelist: if attempt > 0: step_name += ' (attempt %d)' % (attempt + 1) try: - res = self._run(steptype, name=step_name, **kwargs) + res = self(steptype, name=step_name, **kwargs) return res except self.m.step.StepFailure: if attempt == attempts - 1: diff --git a/infra/bots/recipe_modules/skpbench/api.py b/infra/bots/recipe_modules/skpbench/api.py index 452fafedfb..5c2a6963cf 100644 --- a/infra/bots/recipe_modules/skpbench/api.py +++ b/infra/bots/recipe_modules/skpbench/api.py @@ -12,8 +12,8 @@ from recipe_engine import recipe_api def _run(api, title, *cmd, **kwargs): - return api.run(api.step, title, cmd=list(cmd), - cwd=api.vars.skia_dir, **kwargs) + with api.step.context({'cwd': api.vars.skia_dir}): + return api.run(api.step, title, cmd=list(cmd), **kwargs) def _adb(api, title, *cmd, **kwargs): diff --git a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index d125b7e952..1576c10569 100644 --- a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -163,7 +163,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json index c8551a54d8..bcd643e32a 100644 --- a/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json +++ b/infra/bots/recipe_modules/skpbench/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json @@ -163,7 +163,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/__init__.py b/infra/bots/recipe_modules/sktest/__init__.py index 578c162988..c97fd57769 100644 --- a/infra/bots/recipe_modules/sktest/__init__.py +++ b/infra/bots/recipe_modules/sktest/__init__.py @@ -11,6 +11,7 @@ DEPS = [ 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/step', 'flavor', 'run', 'vars', diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index e2ebbf6e64..bbc8844151 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -511,7 +511,6 @@ def test_steps(api): time.sleep(waittime) """, args=[host_hashes_file], - cwd=api.vars.skia_dir, abort_on_failure=False, fail_build_on_failure=False, infra_step=True) @@ -600,9 +599,8 @@ def test_steps(api): if '_PreAbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): args.append('--preAbandonGpuContext') - api.run(api.flavor.step, 'dm', cmd=args, - abort_on_failure=False, - env=env) + with api.step.context({'env': env}): + api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False) if api.vars.upload_dm_results: # Copy images and JSON to host machine if needed. diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index d1382954cd..c79030837e 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json index e7c6f9307a..27dc3d28c8 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json index 0230d7e0d2..b360da4096 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json index 2a17c71af5..e6a5213685 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json index ab597505c8..ca3e2566a8 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json index 93c42499da..c1cf17f770 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json index 054d789281..3e8aefb407 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json index fdc3602450..773bc8c4e5 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json index fd9cf02dad..a314f4d68d 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json index ab8beaa4f9..eda0796320 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json index 21faa61218..2f2ec29174 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json index b83fae5783..77b1947fa1 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json index 404aaba3e2..d34620a6bf 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -516,7 +512,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json index 60fb60464a..72eb1772ca 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -516,7 +512,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json index 48921172b9..4c45342fa2 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -170,7 +169,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -281,7 +279,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -392,7 +389,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -516,7 +512,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index 1504c38b88..52ec330df0 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -617,7 +611,6 @@ "_", "blurcircles" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 33e59c2d71..f186bc4da4 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -519,7 +513,6 @@ "_", "complexclip4_aa" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 52ba785d7f..60d7c97767 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -414,7 +408,6 @@ "_", ".SRW" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 5609dc5552..1bec57b832 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 7762bb2351..26c08c702d 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -423,7 +423,6 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", - "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 9738288a84..8aff2e9560 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -425,7 +425,6 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", - "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index 74f6b068f3..db80bebd7e 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 52b76cdc46..38fb08ae73 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index ba82bdad69..cc831b0bfd 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -425,7 +425,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 6f00416aee..95279d8248 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json index 0d2439e82a..92d070b995 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json index d3207359e7..034a6c1b4f 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json index 42a01733b7..6060e54344 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -376,7 +370,6 @@ "~ReadWriteAlpha", "~XfermodeImageFilterCroppedInput_Gpu" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json index db1da2d9c8..5bce9911e0 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -440,7 +434,6 @@ "~GLPrograms", "~IntTexture" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 9a10db06f9..d5383b0b24 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -370,7 +364,6 @@ "_", ".SRW" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json index 269f77d19e..14a12c2c15 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -372,7 +366,6 @@ "--match", "~GPUMemorySize" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index 8a24ace210..fe347f1590 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -508,7 +502,6 @@ "complexclip4_aa", "--noRAW_threading" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 3c5fa23242..1df8deb276 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -384,7 +378,6 @@ "~GLPrograms", "--noRAW_threading" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 8966429e82..ebcd2bd696 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -5,12 +5,6 @@ "[START_DIR]/skia/resources", "resources" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skia/resources" }, { @@ -40,12 +34,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -54,12 +42,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SKP_VERSION" }, { @@ -67,12 +49,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm skps" }, { @@ -80,12 +56,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir skps" }, { @@ -94,12 +64,6 @@ "[START_DIR]/skp", "skps" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skp" }, { @@ -108,12 +72,6 @@ "[START_DIR]/tmp/SKP_VERSION", "tmp/SKP_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SKP_VERSION" }, { @@ -143,12 +101,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -157,12 +109,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SK_IMAGE_VERSION" }, { @@ -170,12 +116,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm images" }, { @@ -183,12 +123,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir images" }, { @@ -197,12 +131,6 @@ "[START_DIR]/skimage", "images" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/skimage" }, { @@ -211,12 +139,6 @@ "[START_DIR]/tmp/SK_IMAGE_VERSION", "tmp/SK_IMAGE_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" }, { @@ -246,12 +168,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "cat_file tmp/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -260,12 +176,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm tmp/SVG_VERSION" }, { @@ -273,12 +183,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm svgs" }, { @@ -286,12 +190,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir svgs" }, { @@ -300,12 +198,6 @@ "[START_DIR]/svg", "svgs" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_if_needed [START_DIR]/svg" }, { @@ -314,12 +206,6 @@ "[START_DIR]/tmp/SVG_VERSION", "tmp/SVG_VERSION" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { @@ -364,12 +250,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "dm" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "rm dm" }, { @@ -377,12 +257,6 @@ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "dm" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "mkdir dm" }, { @@ -415,13 +289,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -464,12 +331,6 @@ "[START_DIR]/tmp/uninteresting_hashes.txt", "tmp/uninteresting_hashes.txt" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" }, { @@ -479,7 +340,6 @@ "[START_DIR]/skia/gn/package_ios.py", "[START_DIR]/out/Release/dm" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -498,7 +358,6 @@ "--args", "--undefok --resourcePath resources --skps skps --images images/dm --colorImages images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release build_number 5 --svgs svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile tmp/uninteresting_hashes.txt --writePath dm --nocpu --config 8888 srgb pdf gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ gles skp _ _ _ image gen_platf rgba32abf.bmp _ image gen_platf rgb24prof.bmp _ image gen_platf rgb24lprof.bmp _ image gen_platf 8bpp-pixeldata-cropped.bmp _ image gen_platf 4bpp-pixeldata-cropped.bmp _ image gen_platf 32bpp-pixeldata-cropped.bmp _ image gen_platf 24bpp-pixeldata-cropped.bmp _ image gen_platf frame_larger_than_image.gif _ image gen_platf inc0.png _ image gen_platf inc1.png _ image gen_platf inc2.png _ image gen_platf inc3.png _ image gen_platf inc4.png _ image gen_platf inc5.png _ image gen_platf inc6.png _ image gen_platf inc7.png _ image gen_platf inc8.png _ image gen_platf inc9.png _ image gen_platf inc10.png _ image gen_platf inc11.png _ image gen_platf inc12.png _ image gen_platf inc13.png _ image gen_platf inc14.png _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW" ], - "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -513,12 +372,6 @@ "dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "IOS_BUNDLE_ID": "com.google.dm", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "pull_if_needed dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json index 546ff1644f..957dd6ab10 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[START_DIR]\\skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]\\out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -508,7 +502,6 @@ "complexclip4_aa", "--noRAW_threading" ], - "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json index 4712f94e35..8482f9df69 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json index 0c71107be6..65ad219e59 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json index 74c086d188..48406f7816 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json @@ -19,7 +19,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ @@ -119,7 +118,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ @@ -230,7 +228,6 @@ "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ @@ -341,7 +338,6 @@ "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ @@ -465,7 +461,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_push.json b/infra/bots/recipe_modules/sktest/example.expected/failed_push.json index 8bc41ecfac..5f7f94feeb 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_push.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_push.json @@ -70,7 +70,6 @@ "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json index b6b41a8a39..117673b120 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json index d21e413816..4226a3cd5a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/swarming/api.py b/infra/bots/recipe_modules/swarming/api.py index 0a2377fe7f..0b370bfd19 100644 --- a/infra/bots/recipe_modules/swarming/api.py +++ b/infra/bots/recipe_modules/swarming/api.py @@ -44,21 +44,22 @@ class SkiaSwarmingApi(recipe_api.RecipeApi): depot_tools_path = self.m.depot_tools.package_repo_resource() env = {'PATH': self.m.path.pathsep.join([ str(depot_tools_path), '%(PATH)s'])} - self.m.step('download luci-go linux', - ['download_from_google_storage', '--no_resume', - '--platform=linux*', '--no_auth', '--bucket', 'chromium-luci', - '-d', luci_go_dir.join('linux64')], - env=env) - self.m.step('download luci-go mac', - ['download_from_google_storage', '--no_resume', - '--platform=darwin', '--no_auth', '--bucket', 'chromium-luci', - '-d', luci_go_dir.join('mac64')], - env=env) - self.m.step('download luci-go win', - ['download_from_google_storage', '--no_resume', - '--platform=win32', '--no_auth', '--bucket', 'chromium-luci', - '-d', luci_go_dir.join('win64')], - env=env) + with self.m.step.context({'env': env}): + self.m.step('download luci-go linux', + ['download_from_google_storage', '--no_resume', + '--platform=linux*', '--no_auth', + '--bucket', 'chromium-luci', + '-d', luci_go_dir.join('linux64')]) + self.m.step('download luci-go mac', + ['download_from_google_storage', '--no_resume', + '--platform=darwin', '--no_auth', + '--bucket', 'chromium-luci', + '-d', luci_go_dir.join('mac64')]) + self.m.step('download luci-go win', + ['download_from_google_storage', '--no_resume', + '--platform=win32', '--no_auth', '--bucket', + 'chromium-luci', + '-d', luci_go_dir.join('win64')]) # Copy binaries to the expected location. dest = self.m.path['start_dir'].join('luci-go') self.m.run.rmtree(dest) diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py index bb281bbe53..8c06577a1b 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.py +++ b/infra/bots/recipes/swarm_RecreateSKPs.py @@ -92,14 +92,13 @@ def RunSteps(api): # Call GN. platform = 'linux64' # This bot only runs on linux; don't bother checking. gn = src_dir.join('buildtools', platform, 'gn') - api.step('GN', - [gn, 'gen', out_dir], - env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1', - 'GYP_GENERATORS': 'ninja'}) + gn_env = {'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1', + 'GYP_GENERATORS': 'ninja'} + with api.step.context({'env': gn_env}): + api.step('GN', [gn, 'gen', out_dir]) # Build Chrome. - api.step('Build Chrome', - ['ninja', '-C', out_dir, 'chrome']) + api.step('Build Chrome', ['ninja', '-C', out_dir, 'chrome']) # Clean up the output dir. output_dir = api.path['start_dir'].join('skp_output') @@ -120,10 +119,8 @@ def RunSteps(api): '--target_dir', output_dir] if 'Canary' not in api.properties['buildername']: cmd.append('--upload_to_partner_bucket') - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('Recreate SKPs', - cmd=cmd, - env=env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': env}): + api.step('Recreate SKPs', cmd=cmd) # Upload the SKPs. if 'Canary' not in api.properties['buildername']: @@ -136,10 +133,8 @@ def RunSteps(api): '--gitcookies', str(update_skps_gitcookies)] env.update(api.infra.go_env) with gitcookies_auth(api, UPDATE_SKPS_KEY): - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('Upload SKPs', - cmd=cmd, - env=env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': env}): + api.step('Upload SKPs', cmd=cmd) def GenTests(api): diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json index a7e6bf2cce..cbc0be27f0 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index b3713888ae..9deb01e290 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 2202a42108..951d245dd8 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index 1bbb87c52a..ce81ed9bb4 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index db7b2c5525..3de613915d 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -118,8 +118,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -137,8 +135,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -154,8 +150,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index 67a694cec6..0f11391220 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 7289af684b..f5be4fa52b 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 15f4b8a446..089926b907 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 503ecb4816..d2f3f6dcc9 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 3980a9b505..067476bc4a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index 0d69ba7137..e03ec42275 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 5f8af8108c..f1d2900225 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 150fe177b5..0105599d68 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py index 84f122a45e..81cb33cfbc 100644 --- a/infra/bots/recipes/swarm_ct_skps.py +++ b/infra/bots/recipes/swarm_ct_skps.py @@ -200,6 +200,7 @@ def RunSteps(api): tasks_to_swarm_hashes, dimensions=dimensions, io_timeout=40*60) # Now collect all tasks. + env = {'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None} failed_tasks = [] for task in tasks: try: @@ -212,14 +213,14 @@ def RunSteps(api): gs_dest_dir = 'ct/%s/%d/%02d/%02d/%02d/' % ( ct_page_type, utc.year, utc.month, utc.day, utc.hour) for json_output in api.file.listdir('output dir', output_dir): - api.gsutil.upload( - name='upload json output', - source=output_dir.join(json_output), - bucket='skia-perf', - dest=gs_dest_dir, - env={'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None}, - args=['-R'] - ) + with api.step.context({'env': env}): + api.gsutil.upload( + name='upload json output', + source=output_dir.join(json_output), + bucket='skia-perf', + dest=gs_dest_dir, + args=['-R'] + ) except api.step.StepFailure as e: # Add SKP links for convenience. diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index bf92ca970a..8f87e81160 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -120,14 +120,6 @@ "456789" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json index 8acf95b2b6..f842478441 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json @@ -108,14 +108,6 @@ "RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload doxygen" }, { @@ -130,14 +122,6 @@ "[DEPOT_TOOLS]/gsutil.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py index 1b9513c7ba..2dc248c69d 100644 --- a/infra/bots/recipes/swarm_housekeeper.py +++ b/infra/bots/recipes/swarm_housekeeper.py @@ -34,29 +34,28 @@ def RunSteps(api): # TODO(borenet): Detect static initializers? - gsutil_path = api.path['depot_tools'].join('gsutil.py') - if not api.vars.is_trybot: + with api.step.context({'cwd': cwd}): + gsutil_path = api.path['depot_tools'].join('gsutil.py') + if not api.vars.is_trybot: + api.run( + api.step, + 'generate and upload doxygen', + cmd=['python', api.core.resource('generate_and_upload_doxygen.py')], + abort_on_failure=False) + + cmd = ['python', api.core.resource('run_binary_size_analysis.py'), + '--library', api.vars.skia_out.join( + 'Release', 'lib', 'libskia.so'), + '--githash', api.properties['revision'], + '--gsutil_path', gsutil_path] + if api.vars.is_trybot: + cmd.extend(['--issue_number', str(api.properties['patch_issue'])]) api.run( api.step, - 'generate and upload doxygen', - cmd=['python', api.core.resource('generate_and_upload_doxygen.py')], - cwd=cwd, + 'generate and upload binary size data', + cmd=cmd, abort_on_failure=False) - cmd = ['python', api.core.resource('run_binary_size_analysis.py'), - '--library', api.vars.skia_out.join( - 'Release', 'lib', 'libskia.so'), - '--githash', api.properties['revision'], - '--gsutil_path', gsutil_path] - if api.vars.is_trybot: - cmd.extend(['--issue_number', str(api.properties['patch_issue'])]) - api.run( - api.step, - 'generate and upload binary size data', - cmd=cmd, - cwd=cwd, - abort_on_failure=False) - def GenTests(api): yield ( diff --git a/infra/bots/recipes/swarm_infra.py b/infra/bots/recipes/swarm_infra.py index bb70a6a160..ac371a88ce 100644 --- a/infra/bots/recipes/swarm_infra.py +++ b/infra/bots/recipes/swarm_infra.py @@ -24,10 +24,8 @@ def RunSteps(api): # Run the infra tests. infra_tests = api.vars.skia_dir.join('infra', 'bots', 'infra_tests.py') - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('infra_tests', - cmd=['python', infra_tests], - env=api.infra.go_env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': api.infra.go_env}): + api.step('infra_tests', cmd=['python', infra_tests]) def GenTests(api): diff --git a/infra/bots/recipes/swarm_presubmit.py b/infra/bots/recipes/swarm_presubmit.py index 940591e426..52b67cec8a 100644 --- a/infra/bots/recipes/swarm_presubmit.py +++ b/infra/bots/recipes/swarm_presubmit.py @@ -32,9 +32,9 @@ def RunSteps(api): depot_tools_path = api.depot_tools.package_repo_resource() env = {'PATH': api.path.pathsep.join([str(depot_tools_path), '%(PATH)s'])} - api.step('presubmit', - cmd=['git', 'cl', 'presubmit', '--force', '-v', '-v'], - env=env) + with api.step.context({'env': env}): + api.step('presubmit', + cmd=['git', 'cl', 'presubmit', '--force', '-v', '-v']) finally: api.step('git reset', cmd=['git', 'reset', '--hard', 'origin/master']) diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index d125b7e952..1576c10569 100644 --- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -163,7 +163,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index c70125a860..e56cd5a1bb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 222638989a..a0235e85f2 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -5,17 +5,17 @@ deps { project_id: "build" url: "https://chromium.googlesource.com/chromium/tools/build.git" branch: "master" - revision: "d1ef6b3fd7dd9bdf05d583631e9d396097d261ff" + revision: "056fe6a645b937cd0d325b5f70c1900b9363ef34" } deps { project_id: "depot_tools" url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git" branch: "master" - revision: "12fb9ede5ad776a5f9085a1bd093bdfb2b89e08e" + revision: "aa534e509e1b36adb3256a31d8bf0f29f5ef1091" } deps { project_id: "recipe_engine" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" branch: "master" - revision: "d5a670b19aba7fb9a7f6430d39dab1d3414b578a" + revision: "57a75df505dfe20cb1aa6b7536231e56267fa2b8" } |